diff --git a/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
index 0f7554721..e02123358 100644
--- a/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
+++ b/AndorsTrail/res/layout/custom_checkedlistitem_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.gpl.rpg.AndorsTrail.view.SelectableTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="@style/checkedListItem"
     android:layout_width="match_parent"
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
index 23e35cf95..73db1e14c 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/Preferences.java
@@ -2,13 +2,22 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.view.Window;
+import android.view.WindowManager;
 
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 import com.gpl.rpg.AndorsTrail.R;
 
 public final class Preferences extends PreferenceActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		super.onCreate(savedInstanceState);
+		if (AndorsTrailApplication.getApplicationFromActivity(this).getPreferences().fullscreen) {
+			getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		} else {
+			getWindow().setFlags(0, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+		}
 		addPreferencesFromResource(R.xml.preferences);
 	}
 }
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
index 08f7a5279..481ec8906 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/CustomListPreference.java
@@ -1,13 +1,16 @@
 package com.gpl.rpg.AndorsTrail.view;
 
+import android.annotation.TargetApi;
 import android.app.Dialog;
 
 import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.L;
 import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory.CustomDialog;
 
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.util.AttributeSet;
@@ -16,6 +19,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
+import android.widget.TextView;
 
 public class CustomListPreference extends ListPreference {
 
@@ -27,12 +31,14 @@ public class CustomListPreference extends ListPreference {
 		super(context, attrs);
 	}
 	//	Min API 21
-	//	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-	//		super(context, attrs, defStyleAttr);
-	//	}
-	//	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-	//		super(context, attrs, defStyleAttr, defStyleRes);
-	//	}
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public CustomListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
 
 	CustomDialog d = null;
 	int clickedEntryIndex = 0;
@@ -46,15 +52,7 @@ public class CustomListPreference extends ListPreference {
 	private void createDialog() {
 		final ListView choicesList = new ListView(getContext());
 		choicesList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
-		ArrayAdapter<CharSequence> choicesAdapter = new ArrayAdapter<CharSequence>(getContext(), R.layout.custom_checkedlistitem_layout, getEntries()) {
-			@Override
-			public View getView(int position, View convertView, ViewGroup parent) {
-				View v = super.getView(position, convertView, parent);
-//				choicesList.setItemChecked(position, getValueIndex() == position);
-				v.setSelected(getValueIndex() == position);
-				return v;
-			}
-		};
+		ArrayAdapter<CharSequence> choicesAdapter = new ArrayAdapter<CharSequence>(getContext(), R.layout.custom_checkedlistitem_layout, getEntries());
 		choicesList.setLayoutParams(new ListView.LayoutParams(ListView.LayoutParams.MATCH_PARENT, ListView.LayoutParams.WRAP_CONTENT));
 		choicesList.setAdapter(choicesAdapter);
 		choicesList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
new file mode 100644
index 000000000..2250d7456
--- /dev/null
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/SelectableTextView.java
@@ -0,0 +1,62 @@
+package com.gpl.rpg.AndorsTrail.view;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.widget.Checkable;
+import android.widget.TextView;
+
+//Thanks to https://stackoverflow.com/questions/6205339/listview-item-selected-state-not-working
+
+public class SelectableTextView extends TextView implements Checkable {
+	private static final int[] CHECKED_STATE_SET = {
+			android.R.attr.state_checked
+	};
+
+	private boolean mChecked;
+
+	public SelectableTextView(Context context) {
+		super(context);
+	}
+
+	public SelectableTextView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public SelectableTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+		super(context, attrs, defStyleAttr);
+	}
+
+	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
+	public SelectableTextView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+		super(context, attrs, defStyleAttr, defStyleRes);
+	}
+
+	@Override
+	public void setChecked(boolean checked) {
+		if (mChecked != checked) {
+			mChecked = checked;
+			refreshDrawableState();
+		}
+	}
+
+	@Override
+	public boolean isChecked() {
+		return mChecked;
+	}
+
+	@Override
+	public void toggle() {
+		setSelected(!mChecked);
+	}
+
+	@Override
+	protected int[] onCreateDrawableState(int extraSpace) {
+		final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+		if (isChecked()) {
+			mergeDrawableStates(drawableState, CHECKED_STATE_SET);
+		}
+		return drawableState;
+	}
+}