Android: Cleanup formatting

58 files changed, 291 insertions, 314 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
index cea36e1c7a..e0eb5e5415 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/DolphinApplication.java
@@ -4,7 +4,6 @@ import android.app.Application;
 
 import org.dolphinemu.dolphinemu.model.GameDatabase;
 
-
 public class DolphinApplication extends Application
 {
 	public static GameDatabase databaseHelper;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 248a806982..5449dc8ee2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -6,7 +6,6 @@
 
 package org.dolphinemu.dolphinemu;
 
-
 import android.view.Surface;
 import android.widget.Toast;
 
@@ -298,7 +297,6 @@ public final class NativeLibrary
 
 	/**
 	 * Saves a screen capture of the game
-	 *
 	 */
 	public static native void SaveScreenShot();
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index 2e77e9387e..131c95bc6f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -121,8 +121,7 @@ public final class EmulationActivity extends AppCompatActivity
 								getSupportActionBar().hide();
 							}
 						}
-					}
-			);
+					});
 		}
 		else
 		{
@@ -408,7 +407,8 @@ public final class EmulationActivity extends AppCompatActivity
 		{
 			// Edit the placement of the controls
 			case R.id.menu_emulation_edit_layout:
-				EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager().findFragmentById(R.id.frame_emulation_fragment);
+				EmulationFragment emulationFragment = (EmulationFragment) getFragmentManager()
+						.findFragmentById(R.id.frame_emulation_fragment);
 				if (emulationFragment.isConfiguringControls())
 				{
 					emulationFragment.stopConfiguringControls();
@@ -434,13 +434,13 @@ public final class EmulationActivity extends AppCompatActivity
 					}
 					builder.setMultiChoiceItems(R.array.gcpadButtons, enabledButtons,
 							new DialogInterface.OnMultiChoiceClickListener()
-					{
-						@Override
-						public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
-						{
-							editor.putBoolean("buttonToggleGc" + indexSelected, isChecked);
-						}
-					});
+							{
+								@Override
+								public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
+								{
+									editor.putBoolean("buttonToggleGc" + indexSelected, isChecked);
+								}
+							});
 				}
 				else if (mPreferences.getInt("wiiController", 3) == 4)
 				{
@@ -450,13 +450,13 @@ public final class EmulationActivity extends AppCompatActivity
 					}
 					builder.setMultiChoiceItems(R.array.classicButtons, enabledButtons,
 							new DialogInterface.OnMultiChoiceClickListener()
-					{
-						@Override
-						public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
-						{
-							editor.putBoolean("buttonToggleClassic" + indexSelected, isChecked);
-						}
-					});
+							{
+								@Override
+								public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
+								{
+									editor.putBoolean("buttonToggleClassic" + indexSelected, isChecked);
+								}
+							});
 				}
 				else
 				{
@@ -468,25 +468,25 @@ public final class EmulationActivity extends AppCompatActivity
 					{
 						builder.setMultiChoiceItems(R.array.nunchukButtons, enabledButtons,
 								new DialogInterface.OnMultiChoiceClickListener()
-						{
-							@Override
-							public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
-							{
-								editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
-							}
-						});
+								{
+									@Override
+									public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
+									{
+										editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
+									}
+								});
 					}
 					else
 					{
 						builder.setMultiChoiceItems(R.array.wiimoteButtons, enabledButtons,
 								new DialogInterface.OnMultiChoiceClickListener()
-						{
-							@Override
-							public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
-							{
-								editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
-							}
-						});
+								{
+									@Override
+									public void onClick(DialogInterface dialog, int indexSelected, boolean isChecked)
+									{
+										editor.putBoolean("buttonToggleWii" + indexSelected, isChecked);
+									}
+								});
 					}
 				}
 				builder.setNeutralButton(getString(R.string.emulation_toggle_all), new DialogInterface.OnClickListener()
@@ -499,7 +499,7 @@ public final class EmulationActivity extends AppCompatActivity
 						emulationFragment.toggleInputOverlayVisibility();
 					}
 				});
-				builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
+				builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
 				{
 					@Override
 					public void onClick(DialogInterface dialogInterface, int i)
@@ -552,7 +552,7 @@ public final class EmulationActivity extends AppCompatActivity
 				AlertDialog.Builder builder = new AlertDialog.Builder(this);
 				builder.setTitle(R.string.emulation_control_scale);
 				builder.setView(view);
-				builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
+				builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
 				{
 					@Override
 					public void onClick(DialogInterface dialogInterface, int i)
@@ -580,17 +580,17 @@ public final class EmulationActivity extends AppCompatActivity
 				builder.setTitle(R.string.emulation_choose_controller);
 				builder.setSingleChoiceItems(R.array.controllersEntries, mPreferences.getInt("wiiController", 3),
 						new DialogInterface.OnClickListener()
-				{
-					@Override
-					public void onClick(DialogInterface dialog, int indexSelected)
-					{
-						editor.putInt("wiiController", indexSelected);
+						{
+							@Override
+							public void onClick(DialogInterface dialog, int indexSelected)
+							{
+								editor.putInt("wiiController", indexSelected);
 
-						NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
-								getResources().getStringArray(R.array.controllersValues)[indexSelected]);
-					}
-				});
-				builder.setPositiveButton(getString(R.string.emulation_done), new DialogInterface.OnClickListener()
+								NativeLibrary.SetConfig("WiimoteNew.ini", "Wiimote1", "Extension",
+										getResources().getStringArray(R.array.controllersValues)[indexSelected]);
+							}
+						});
+				builder.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener()
 				{
 					@Override
 					public void onClick(DialogInterface dialogInterface, int i)
@@ -619,7 +619,7 @@ public final class EmulationActivity extends AppCompatActivity
 				NativeLibrary.SaveScreenShot();
 				return;
 
-			// Quicksave / Load
+			// Quick save / load
 			case R.id.menu_quicksave:
 				NativeLibrary.SaveState(9);
 				return;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
index a98fb246c4..8972ac95bd 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.adapters;
 
-
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.content.Context;
@@ -17,10 +16,11 @@ public class PlatformPagerAdapter extends FragmentPagerAdapter
 {
 	private Context mContext;
 
-	private final static int[] TAB_ICONS = {
+	private final static int[] TAB_ICONS =
+	{
 			R.drawable.ic_gamecube,
 			R.drawable.ic_wii,
-			R.drawable.ic_folder// wiiware TODO Have an icon here.
+			R.drawable.ic_folder // WiiWare TODO Have an icon here.
 	};
 
 	public PlatformPagerAdapter(FragmentManager fm, Context context)
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
index beef06a218..9a75fe9301 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/SettingsRowPresenter.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.adapters;
 
-
 import android.content.res.Resources;
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
@@ -44,4 +43,4 @@ public final class SettingsRowPresenter extends Presenter
 	{
 		// no op
 	}
-}
\ No newline at end of file
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
index 714db42e9f..5b351478d2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.dialogs;
 
-
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -63,7 +62,7 @@ public final class GameDetailsDialog extends DialogFragment
 		FloatingActionButton buttonLaunch = (FloatingActionButton) contents.findViewById(R.id.button_launch);
 
 		int countryIndex = getArguments().getInt(ARGUMENT_GAME_COUNTRY);
-		String country = getResources().getStringArray(R.array.country_names)[countryIndex];
+		String country = getResources().getStringArray(R.array.countryNames)[countryIndex];
 
 		textTitle.setText(getArguments().getString(ARGUMENT_GAME_TITLE));
 		textDescription.setText(getArguments().getString(ARGUMENT_GAME_DESCRIPTION));
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
index dd16ca8af3..bb83a7f1ae 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
@@ -175,4 +175,4 @@ public final class MotionAlertDialog extends AlertDialog
 
 		dismiss();
 	}
-}
\ No newline at end of file
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
index b70196a773..7066b34c65 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
@@ -18,7 +18,6 @@ import org.dolphinemu.dolphinemu.R;
 import org.dolphinemu.dolphinemu.overlay.InputOverlay;
 import org.dolphinemu.dolphinemu.utils.Log;
 
-
 public final class EmulationFragment extends Fragment implements SurfaceHolder.Callback
 {
 	public static final String FRAGMENT_TAG = BuildConfig.APPLICATION_ID + ".emulation_fragment";
@@ -36,7 +35,6 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
 	private boolean mEmulationStarted;
 	private boolean mEmulationRunning;
 
-
 	public static EmulationFragment newInstance(String path)
 	{
 		EmulationFragment fragment = new EmulationFragment();
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
index ac37df37bd..057432b8a2 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/FileListItem.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.model;
 
-
 import org.dolphinemu.dolphinemu.NativeLibrary;
 
 import java.io.File;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
index ccd87bfa4c..f53e2dc39d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/TvSettingsItem.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.model;
 
-
 public final class TvSettingsItem
 {
 	private final int mItemId;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java
index adc19f8c30..4f8e3b4045 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.model.settings.view;
 
-
 import org.dolphinemu.dolphinemu.model.settings.BooleanSetting;
 import org.dolphinemu.dolphinemu.model.settings.Setting;
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java
index 2d5744c555..82e0486229 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.model.settings.view;
 
-
 import org.dolphinemu.dolphinemu.model.settings.Setting;
 
 public final class HeaderSetting extends SettingsItem
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java
index 07880587c2..65d725369a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.model.settings.view;
 
-
 import org.dolphinemu.dolphinemu.model.settings.IntSetting;
 import org.dolphinemu.dolphinemu.model.settings.Setting;
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
index 1481faaa70..6c75e55544 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
@@ -33,7 +33,7 @@ import java.util.Set;
 
 /**
  * Draws the interactive input overlay on top of the
- * {@link NativeGLSurfaceView} that is rendering emulation.
+ * {@link SurfaceView} that is rendering emulation.
  */
 public final class InputOverlay extends SurfaceView implements OnTouchListener
 {
@@ -215,8 +215,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 		int fingerPositionX = (int)event.getX(pointerIndex);
 		int fingerPositionY = (int)event.getY(pointerIndex);
 
-		//Maybe combine Button and Joystick as subclasses of the same parent?
-		//Or maybe create an interface like IMoveableHUDControl?
+		// Maybe combine Button and Joystick as subclasses of the same parent?
+		// Or maybe create an interface like IMoveableHUDControl?
 
 		for (InputOverlayDrawableButton button : overlayButtons)
 		{
@@ -245,7 +245,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 				case MotionEvent.ACTION_POINTER_UP:
 					if (mButtonBeingConfigured == button)
 					{
-						//Persist button position by saving new place.
+						// Persist button position by saving new place.
 						saveControlPosition(mButtonBeingConfigured.getId(), mButtonBeingConfigured.getBounds().left, mButtonBeingConfigured.getBounds().top);
 						mButtonBeingConfigured = null;
 					}
@@ -280,7 +280,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 				case MotionEvent.ACTION_POINTER_UP:
 					if (mDpadBeingConfigured == dpad)
 					{
-						//Persist button position by saving new place.
+						// Persist button position by saving new place.
 						saveControlPosition(mDpadBeingConfigured.getId(0), mDpadBeingConfigured.getBounds().left, mDpadBeingConfigured.getBounds().top);
 						mDpadBeingConfigured = null;
 					}
@@ -638,8 +638,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
 		// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
 		// These were set in the input overlay configuration menu.
-		int drawableX = (int) sPrefs.getFloat(buttonId+"-X", 0f);
-		int drawableY = (int) sPrefs.getFloat(buttonId+"-Y", 0f);
+		int drawableX = (int) sPrefs.getFloat(buttonId + "-X", 0f);
+		int drawableY = (int) sPrefs.getFloat(buttonId + "-Y", 0f);
 
 		// Intrinsic width and height of the InputOverlayDrawableButton.
 		// For any who may not know, intrinsic width/height
@@ -649,7 +649,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
 		// Now set the bounds for the InputOverlayDrawableButton.
 		// This will dictate where on the screen (and the what the size) the InputOverlayDrawableButton will be.
-		overlayDrawable.setBounds(drawableX, drawableY, drawableX+intrinWidth, drawableY+intrinHeight);
+		overlayDrawable.setBounds(drawableX, drawableY, drawableX + intrinWidth, drawableY + intrinHeight);
 
 		// Need to set the image's position
 		overlayDrawable.setPosition(drawableX, drawableY);
@@ -660,12 +660,12 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 	/**
 	 * Initializes an {@link InputOverlayDrawableDpad}
 	 *
-	 * @param context  The current {@link Context}.
-	 * @param resId    The resource ID of the {@link Drawable} to get the {@link Bitmap} of.
-	 * @param buttonUp  Identifier for the up button.
+	 * @param context     The current {@link Context}.
+	 * @param resId       The resource ID of the {@link Drawable} to get the {@link Bitmap} of.
+	 * @param buttonUp    Identifier for the up button.
 	 * @param buttonDown  Identifier for the down button.
 	 * @param buttonLeft  Identifier for the left button.
-	 * @param buttonRight  Identifier for the right button.
+	 * @param buttonRight Identifier for the right button.
 	 *
 	 * @return the initialized {@link InputOverlayDrawableDpad}
 	 */
@@ -705,8 +705,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
 		// The X and Y coordinates of the InputOverlayDrawableDpad on the InputOverlay.
 		// These were set in the input overlay configuration menu.
-		int drawableX = (int) sPrefs.getFloat(buttonUp+"-X", 0f);
-		int drawableY = (int) sPrefs.getFloat(buttonUp+"-Y", 0f);
+		int drawableX = (int) sPrefs.getFloat(buttonUp + "-X", 0f);
+		int drawableY = (int) sPrefs.getFloat(buttonUp + "-Y", 0f);
 
 		// Intrinsic width and height of the InputOverlayDrawableDpad.
 		// For any who may not know, intrinsic width/height
@@ -716,7 +716,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
 		// Now set the bounds for the InputOverlayDrawableDpad.
 		// This will dictate where on the screen (and the what the size) the InputOverlayDrawableDpad will be.
-		overlayDrawable.setBounds(drawableX, drawableY, drawableX+intrinWidth, drawableY+intrinHeight);
+		overlayDrawable.setBounds(drawableX, drawableY, drawableX + intrinWidth, drawableY + intrinHeight);
 
 		// Need to set the image's position
 		overlayDrawable.setPosition(drawableX, drawableY);
@@ -730,7 +730,7 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 	 * @param context   The current {@link Context}
 	 * @param resOuter  Resource ID for the outer image of the joystick (the static image that shows the circular bounds).
 	 * @param resInner  Resource ID for the inner image of the joystick (the one you actually move around).
-	 * @param joystick    Identifier for which joystick this is.
+	 * @param joystick  Identifier for which joystick this is.
 	 * 
 	 * @return the initialized {@link InputOverlayDrawableJoystick}.
 	 */
@@ -753,8 +753,8 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 
 		// The X and Y coordinates of the InputOverlayDrawableButton on the InputOverlay.
 		// These were set in the input overlay configuration menu.
-		int drawableX = (int) sPrefs.getFloat(joystick+"-X", 0f);
-		int drawableY = (int) sPrefs.getFloat(joystick+"-Y", 0f);
+		int drawableX = (int) sPrefs.getFloat(joystick + "-X", 0f);
+		int drawableY = (int) sPrefs.getFloat(joystick + "-Y", 0f);
 
 		// Decide inner scale based on joystick ID
 		float innerScale;
@@ -797,5 +797,4 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
 	{
 		return mIsInEditMode;
 	}
-	
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
index 7c1584e529..e0ae7b6a52 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
@@ -29,10 +29,10 @@ public final class InputOverlayDrawableDpad extends BitmapDrawable
 	 *
 	 * @param res         {@link Resources} instance.
 	 * @param bitmap      {@link Bitmap} to use with this Drawable.
-	 * @param buttonUp  Identifier for the up button.
+	 * @param buttonUp    Identifier for the up button.
 	 * @param buttonDown  Identifier for the down button.
 	 * @param buttonLeft  Identifier for the left button.
-	 * @param buttonRight  Identifier for the right button.
+	 * @param buttonRight Identifier for the right button.
 	 */
 	public InputOverlayDrawableDpad(Resources res, Bitmap bitmap,
 					int buttonUp, int buttonDown,
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
index fcd0befdc2..252d3886a4 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/DividerItemDecoration.java
@@ -154,4 +154,4 @@ public final class DividerItemDecoration extends RecyclerView.ItemDecoration
 					"DividerItemDecoration can only be used with a LinearLayoutManager.");
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java
index 12c8ae832c..5fa0368ee8 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.main;
 
-
 import android.database.Cursor;
 
 /**
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
index c4f753edbd..a003603b1a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
@@ -250,7 +250,7 @@ public final class TvMainActivity extends Activity implements MainView
 				R.string.grid_menu_refresh));
 
 		// Create a header for this row.
-		HeaderItem header = new HeaderItem(R.string.settings, getString(R.string.settings));
+		HeaderItem header = new HeaderItem(R.string.preferences_settings, getString(R.string.preferences_settings));
 
 		return new ListRow(header, rowItems);
 	}
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesPresenter.java
index 5dda2e5535..403ba4ef18 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesPresenter.java
@@ -48,15 +48,14 @@ public final class PlatformGamesPresenter
 				.subscribeOn(Schedulers.io())
 				.observeOn(AndroidSchedulers.mainThread())
 				.subscribe(new Action1<Cursor>()
-						   {
-							   @Override
-							   public void call(Cursor games)
-							   {
-								   Log.debug("[PlatformGamesPresenter] " + mPlatform + ": Load finished, swapping cursor...");
-
-								   mView.showGames(games);
-							   }
-						   }
-				);
+				{
+					@Override
+					public void call(Cursor games)
+					{
+						Log.debug("[PlatformGamesPresenter] " + mPlatform + ": Load finished, swapping cursor...");
+
+						mView.showGames(games);
+					}
+				});
 	}
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java
index 9c05534bd5..361d16dfbc 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesView.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.platform;
 
-
 import android.database.Cursor;
 
 /**
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
index 2ba41846b9..976c808c4a 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.settings;
 
-
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
index 7aea8c88d0..67de37c546 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.settings;
 
-
 import android.os.Bundle;
 
 import org.dolphinemu.dolphinemu.BuildConfig;
@@ -58,23 +57,23 @@ public final class SettingsActivityPresenter
 					.subscribeOn(Schedulers.io())
 					.observeOn(AndroidSchedulers.mainThread())
 					.subscribe(new Action1<HashMap<String, SettingSection>>()
-							   {
-								   @Override
-								   public void call(HashMap<String, SettingSection> settingsBySection)
-								   {
-									   mSettingsBySection = settingsBySection;
-									   mView.onSettingsFileLoaded(settingsBySection);
-								   }
-							   },
-							new Action1<Throwable>()
-							{
-								@Override
-								public void call(Throwable throwable)
-								{
-									Log.error("[SettingsActivityPresenter] Error reading file " + filename + ".ini: "+ throwable.getMessage());
-									mView.onSettingsFileNotFound();
-								}
-							});
+					{
+						@Override
+						public void call(HashMap<String, SettingSection> settingsBySection)
+						{
+							mSettingsBySection = settingsBySection;
+							mView.onSettingsFileLoaded(settingsBySection);
+						}
+					},
+					new Action1<Throwable>()
+					{
+						@Override
+						public void call(Throwable throwable)
+						{
+							Log.error("[SettingsActivityPresenter] Error reading file " + filename + ".ini: "+ throwable.getMessage());
+							mView.onSettingsFileNotFound();
+						}
+					});
 		}
 		else
 		{
@@ -100,23 +99,22 @@ public final class SettingsActivityPresenter
 			SettingsFile.saveFile(mFileName, mSettingsBySection)
 					.subscribeOn(Schedulers.io())
 					.observeOn(AndroidSchedulers.mainThread())
-					.subscribe(
-							new Action1<Boolean>()
-							{
-								@Override
-								public void call(Boolean aBoolean)
-								{
-									mView.showToastMessage("Saved successfully to " + mFileName + ".ini");
-								}
-							},
-							new Action1<Throwable>()
-							{
-								@Override
-								public void call(Throwable throwable)
-								{
-									mView.showToastMessage("Error saving " + mFileName + ".ini: " + throwable.getMessage());
-								}
-							});
+					.subscribe(new Action1<Boolean>()
+					{
+						@Override
+						public void call(Boolean aBoolean)
+						{
+							mView.showToastMessage("Saved successfully to " + mFileName + ".ini");
+						}
+					},
+					new Action1<Throwable>()
+					{
+						@Override
+						public void call(Throwable throwable)
+						{
+							mView.showToastMessage("Error saving " + mFileName + ".ini: " + throwable.getMessage());
+						}
+					});
 		}
 	}
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java
index 235e43ee63..de8149cc07 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java
@@ -158,8 +158,8 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
 
 		builder.setTitle(item.getNameId());
 		builder.setView(view);
-		builder.setPositiveButton(R.string.dialog_seekbar_pos, this);
-		builder.setNegativeButton(R.string.dialog_seekbar_neg, this);
+		builder.setPositiveButton(R.string.ok, this);
+		builder.setNegativeButton(R.string.cancel, this);
 		mDialog = builder.show();
 
 		mTextSliderValue = (TextView) view.findViewById(R.id.text_value);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java
index 2dd8517f6e..1eb8dc7d95 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java
@@ -160,7 +160,7 @@ public final class SettingsFragmentPresenter
 		}
 
 		// TODO Set default value for cpuCore based on arch.
-		sl.add(new SingleChoiceSetting(SettingsFile.KEY_CPU_CORE, SettingsFile.SECTION_CORE, R.string.cpu_core, 0, R.array.string_emu_cores, R.array.int_emu_cores, 4, cpuCore));
+		sl.add(new SingleChoiceSetting(SettingsFile.KEY_CPU_CORE, SettingsFile.SECTION_CORE, R.string.cpu_core, 0, R.array.emuCoresEntries, R.array.emuCoresValues, 4, cpuCore));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_DUAL_CORE, SettingsFile.SECTION_CORE, R.string.dual_core, R.string.dual_core_descrip, true, dualCore));
 		sl.add(new CheckBoxSetting(SettingsFile.KEY_OVERCLOCK_ENABLE, SettingsFile.SECTION_CORE, R.string.overclock_enable, R.string.overclock_enable_description, false, overclockEnable));
 		sl.add(new SliderSetting(SettingsFile.KEY_OVERCLOCK_PERCENT, SettingsFile.SECTION_CORE, R.string.overclock_title, 0, 400, "%", 100, overclock));
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java
index c65fde1d66..13a7524385 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.settings.viewholder;
 
-
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.TextView;
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java
index 9615c720fb..e44aadbde0 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.ui.settings.viewholder;
 
-
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
index 9e651fc102..ba87dda893 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/InputBindingPreference.java
@@ -61,6 +61,4 @@ public final class InputBindingPreference extends EditTextPreference
 		String summary = super.getSummary().toString();
 		return String.format(summary, getText());
 	}
-
-
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
index 666b528a88..457c49636c 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Log.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.utils;
 
-
 import org.dolphinemu.dolphinemu.BuildConfig;
 
 /**
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
index 3264e93f5b..d380625e60 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/viewholders/TvSettingsViewHolder.java
@@ -1,6 +1,5 @@
 package org.dolphinemu.dolphinemu.viewholders;
 
-
 import android.support.v17.leanback.widget.ImageCardView;
 import android.support.v17.leanback.widget.Presenter;
 import android.view.View;
diff --git a/Source/Android/app/src/main/res/anim/button_elevation.xml b/Source/Android/app/src/main/res/animator/button_elevation.xml
index d96b299541..b6a0974a09 100644
--- a/Source/Android/app/src/main/res/anim/button_elevation.xml
+++ b/Source/Android/app/src/main/res/animator/button_elevation.xml
@@ -1,5 +1,6 @@
-<!-- res/anim/button_elevation.xml -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+
     <item android:state_pressed="true">
         <objectAnimator
             android:propertyName="translationZ"
@@ -8,6 +9,7 @@
             android:valueTo="@dimen/elevation_high"
             android:valueType="floatType"/>
     </item>
+
     <item>
         <objectAnimator
             android:propertyName="translationZ"
@@ -16,4 +18,5 @@
             android:valueTo="@dimen/elevation_low"
             android:valueType="floatType"/>
     </item>
-</selector>
\ No newline at end of file
+
+</set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_in.xml b/Source/Android/app/src/main/res/animator/menu_slide_in.xml
index e6f9ae6d8e..fff198cb47 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_in.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_in.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
+
     <objectAnimator
         android:propertyName="translationX"
         android:valueType="floatType"
@@ -7,6 +8,7 @@
         android:valueTo="0"
         android:interpolator="@android:interpolator/decelerate_quad"
         android:duration="300"/>
+
     <objectAnimator
         android:propertyName="alpha"
         android:valueType="floatType"
@@ -14,4 +16,5 @@
         android:valueTo="1"
         android:interpolator="@android:interpolator/accelerate_quad"
         android:duration="300"/>
+
 </set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/menu_slide_out.xml b/Source/Android/app/src/main/res/animator/menu_slide_out.xml
index 85c2556e48..88f300280a 100644
--- a/Source/Android/app/src/main/res/animator/menu_slide_out.xml
+++ b/Source/Android/app/src/main/res/animator/menu_slide_out.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
+
     <!-- This animation is used ONLY when a submenu is replaced. -->
     <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="translationX"
-                    android:valueType="floatType"
-                    android:valueFrom="0"
-                    android:valueTo="1280"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="300"/>
+         android:propertyName="translationX"
+         android:valueType="floatType"
+         android:valueFrom="0"
+         android:valueTo="1280"
+         android:interpolator="@android:interpolator/decelerate_quad"
+         android:duration="300"/>
+
     <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:propertyName="alpha"
-                    android:valueType="floatType"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:interpolator="@android:interpolator/decelerate_quad"
-                    android:duration="300"/>
+         android:propertyName="alpha"
+         android:valueType="floatType"
+         android:valueFrom="1"
+         android:valueTo="0"
+         android:interpolator="@android:interpolator/decelerate_quad"
+         android:duration="300"/>
+
 </set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/settings_enter.xml b/Source/Android/app/src/main/res/animator/settings_enter.xml
index 1e180ca6bc..23ba7b802b 100644
--- a/Source/Android/app/src/main/res/animator/settings_enter.xml
+++ b/Source/Android/app/src/main/res/animator/settings_enter.xml
@@ -24,4 +24,5 @@
         android:startOffset="@android:integer/config_shortAnimTime"
         android:valueFrom="100.0"
         android:valueTo="0"/>
+
 </set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/settings_exit.xml b/Source/Android/app/src/main/res/animator/settings_exit.xml
index f5480541a9..fece2c34ea 100644
--- a/Source/Android/app/src/main/res/animator/settings_exit.xml
+++ b/Source/Android/app/src/main/res/animator/settings_exit.xml
@@ -24,4 +24,5 @@
         android:startOffset="@android:integer/config_shortAnimTime"
         android:valueFrom="0"
         android:valueTo="-100.0"/>
+
 </set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/animator/settings_pop_enter.xml b/Source/Android/app/src/main/res/animator/settings_pop_enter.xml
index f61efac611..36c8a27e7a 100644
--- a/Source/Android/app/src/main/res/animator/settings_pop_enter.xml
+++ b/Source/Android/app/src/main/res/animator/settings_pop_enter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android">
+
     <objectAnimator
         android:duration="@android:integer/config_mediumAnimTime"
         android:interpolator="@android:interpolator/decelerate_cubic"
diff --git a/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml b/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml
index 13a0ce1ff3..dd16018f23 100644
--- a/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml
+++ b/Source/Android/app/src/main/res/animator/setttings_pop_exit.xml
@@ -23,4 +23,5 @@
         android:startOffset="@android:integer/config_shortAnimTime"
         android:valueFrom="0.0"
         android:valueTo="100"/>
+
 </set>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml b/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
index 787de65186..276f5ad133 100644
--- a/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-television/fragment_emulation.xml
@@ -11,4 +11,5 @@
         android:layout_width="match_parent"
         android:focusable="false"
         android:focusableInTouchMode="false"/>
-</FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_add_directory.xml b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
index 3308cbe028..b52a9b5187 100644
--- a/Source/Android/app/src/main/res/layout/activity_add_directory.xml
+++ b/Source/Android/app/src/main/res/layout/activity_add_directory.xml
@@ -14,7 +14,6 @@
         android:theme="@android:style/ThemeOverlay.Material.Dark.ActionBar"
         android:elevation="6dp"/>
 
-
     <android.support.v7.widget.RecyclerView
         android:id="@+id/list_files"
         android:layout_width="match_parent"
@@ -25,5 +24,4 @@
         android:elevation="4dp"
         android:background="@android:color/white"/>
 
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_emulation.xml b/Source/Android/app/src/main/res/layout/activity_emulation.xml
index 9e4e84e151..3aa230a070 100644
--- a/Source/Android/app/src/main/res/layout/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout/activity_emulation.xml
@@ -1,8 +1,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:layout_width="match_parent"
              android:layout_height="match_parent"
-             android:id="@+id/frame_content"
-    >
+             android:id="@+id/frame_content">
 
     <FrameLayout
         android:id="@+id/frame_emulation_fragment"
diff --git a/Source/Android/app/src/main/res/layout/activity_main.xml b/Source/Android/app/src/main/res/layout/activity_main.xml
index 845ff24b45..e857dfa385 100644
--- a/Source/Android/app/src/main/res/layout/activity_main.xml
+++ b/Source/Android/app/src/main/res/layout/activity_main.xml
@@ -26,7 +26,6 @@
             app:tabMode="fixed"
             app:tabGravity="fill"/>
 
-
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v4.view.ViewPager
@@ -45,4 +44,5 @@
         app:rippleColor="?android:colorPrimaryDark"
         app:layout_anchor="@+id/pager_platforms"
         app:layout_anchorGravity="bottom|right|end"/>
+
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/activity_tv_main.xml b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
index 922d874b02..fd1573f5c4 100644
--- a/Source/Android/app/src/main/res/layout/activity_tv_main.xml
+++ b/Source/Android/app/src/main/res/layout/activity_tv_main.xml
@@ -7,7 +7,6 @@
         android:name="android.support.v17.leanback.app.BrowseFragment"
         android:id="@+id/fragment_game_list"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="match_parent"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/card_game.xml b/Source/Android/app/src/main/res/layout/card_game.xml
index 8830d4ea1d..f831b01f3d 100644
--- a/Source/Android/app/src/main/res/layout/card_game.xml
+++ b/Source/Android/app/src/main/res/layout/card_game.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                                     xmlns:tools="http://schemas.android.com/tools"
                                     android:layout_width="match_parent"
@@ -8,8 +7,7 @@
                                     android:transitionName="card_game"
                                     android:focusable="true"
                                     android:clickable="true"
-                                    android:foreground="?android:attr/selectableItemBackground"
-    >
+                                    android:foreground="?android:attr/selectableItemBackground">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/Source/Android/app/src/main/res/layout/dialog_game_details.xml b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
index 68715f82be..efd17e74cb 100644
--- a/Source/Android/app/src/main/res/layout/dialog_game_details.xml
+++ b/Source/Android/app/src/main/res/layout/dialog_game_details.xml
@@ -20,8 +20,7 @@
             android:layout_marginTop="24dp"
             tools:src="@drawable/placeholder_banner"
             app:civ_border_color="?android:colorAccent"
-            app:civ_border_width="2dp"
-            />
+            app:civ_border_width="2dp"/>
 
         <ImageView
             android:id="@+id/image_game_screen"
@@ -59,8 +58,7 @@
             android:layout_alignStart="@+id/text_game_title"
             android:layout_below="@+id/text_game_title"
             android:layout_marginTop="8dp"
-            tools:text="Zany rhythm action!"
-            />
+            tools:text="Zany rhythm action!"/>
 
         <View
             android:id="@+id/divider"
@@ -70,7 +68,6 @@
             android:layout_alignParentRight="true"
             android:layout_below="@+id/text_company"
             android:layout_marginTop="16dp"
-
             android:background="#1F000000"/>
 
         <ImageView
@@ -122,13 +119,12 @@
             android:layout_alignEnd="@+id/text_game_title"
             android:layout_marginBottom="-28dp"
             android:src="@drawable/ic_play"
-            android:stateListAnimator="@anim/button_elevation"
+            android:stateListAnimator="@animator/button_elevation"
             app:rippleColor="?android:colorPrimaryDark"
             app:borderWidth="0dp"
             app:elevation="6dp"
-            app:pressedTranslationZ="12dp"
-            />
-    </RelativeLayout>
+            app:pressedTranslationZ="12dp"/>
 
+    </RelativeLayout>
 
 </FrameLayout>
diff --git a/Source/Android/app/src/main/res/layout/fragment_grid.xml b/Source/Android/app/src/main/res/layout/fragment_grid.xml
index 3711602198..f7fbcc6427 100644
--- a/Source/Android/app/src/main/res/layout/fragment_grid.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_grid.xml
@@ -2,8 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools"
              android:layout_width="match_parent"
-             android:layout_height="match_parent"
-    >
+             android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/grid_games"
@@ -12,4 +11,5 @@
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         tools:listitem="@layout/card_game"/>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
index e218fac5b5..4bf4e6193f 100644
--- a/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_ingame_menu.xml
@@ -5,8 +5,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="@color/dolphin_blue_dark"
-              tools:layout_width="250dp"
-    >
+              tools:layout_width="250dp">
 
     <TextView
         android:id="@+id/text_game_title"
@@ -20,8 +19,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        >
+        android:layout_weight="1">
 
         <LinearLayout
             android:id="@+id/layout_options"
@@ -31,7 +29,7 @@
 
             <Button
                 android:id="@+id/menu_take_screenshot"
-                android:text="@string/overlay_screenshot"
+                android:text="@string/emulation_screenshot"
                 style="@style/InGameMenuOption"/>
 
             <Button
@@ -46,17 +44,17 @@
 
             <Button
                 android:id="@+id/menu_emulation_save_root"
-                android:text="@string/overlay_savestate"
+                android:text="@string/emulation_savestate"
                 style="@style/InGameMenuOption"/>
 
             <Button
                 android:id="@+id/menu_emulation_load_root"
-                android:text="@string/overlay_loadstate"
+                android:text="@string/emulation_loadstate"
                 style="@style/InGameMenuOption"/>
 
             <Button
                 android:id="@+id/menu_ingame_settings"
-                android:text="@string/settings"
+                android:text="@string/preferences_settings"
                 style="@style/InGameMenuOption"/>
 
             <Button
@@ -66,9 +64,11 @@
 
             <Button
                 android:id="@+id/menu_exit"
-                android:text="@string/overlay_exit_emulation"
+                android:text="@string/emulation_exit"
                 style="@style/InGameMenuOption"/>
 
         </LinearLayout>
+
     </ScrollView>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml b/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
index d656890320..01f167dc6b 100644
--- a/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_input_gc_list.xml
@@ -14,23 +14,20 @@
 
         <include
             android:id="@+id/list_item_controller_one"
-            layout="@layout/list_item_setting"
-            />
+            layout="@layout/list_item_setting"/>
 
         <include
             android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"
-            />
+            layout="@layout/list_item_setting"/>
 
         <include
             android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"
-            />
+            layout="@layout/list_item_setting"/>
 
         <include
             android:id="@+id/list_item_controller_two"
-            layout="@layout/list_item_setting"
-            />
+            layout="@layout/list_item_setting"/>
+
     </LinearLayout>
 
 </org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/fragment_settings.xml b/Source/Android/app/src/main/res/layout/fragment_settings.xml
index 7af8c7c268..9295228853 100644
--- a/Source/Android/app/src/main/res/layout/fragment_settings.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.dolphinemu.dolphinemu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
+                                                           android:layout_width="match_parent"
+                                                           android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/list_settings"
diff --git a/Source/Android/app/src/main/res/layout/fragment_state_load.xml b/Source/Android/app/src/main/res/layout/fragment_state_load.xml
index 1b04c6ce59..b3074c469d 100644
--- a/Source/Android/app/src/main/res/layout/fragment_state_load.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_state_load.xml
@@ -3,8 +3,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:background="#af000000"
-             android:orientation="vertical"
-    >
+             android:orientation="vertical">
 
     <GridLayout
         android:id="@+id/grid_state_slots"
@@ -18,48 +17,44 @@
             android:id="@+id/menu_emulation_load_1"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot1"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot1"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_load_2"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot2"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot2"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_load_3"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot3"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot3"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_load_4"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot4"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot4"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_load_5"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot5"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot5"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_load_6"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot6"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot6"
+            style="@style/InGameMenuOption"/>
+
     </GridLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/layout/fragment_state_save.xml b/Source/Android/app/src/main/res/layout/fragment_state_save.xml
index b5ca1e1ed8..2c7b4a8298 100644
--- a/Source/Android/app/src/main/res/layout/fragment_state_save.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_state_save.xml
@@ -3,8 +3,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent"
              android:background="#af000000"
-             android:orientation="vertical"
-    >
+             android:orientation="vertical">
 
     <GridLayout
         android:id="@+id/grid_state_slots"
@@ -18,48 +17,44 @@
             android:id="@+id/menu_emulation_save_1"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot1"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot1"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_save_2"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot2"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot2"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_save_3"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot3"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot3"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_save_4"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot4"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot4"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_save_5"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot5"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot5"
+            style="@style/InGameMenuOption"/>
 
         <Button
             android:id="@+id/menu_emulation_save_6"
             android:layout_width="128dp"
             android:layout_height="128dp"
-            android:text="@string/overlay_slot6"
-            style="@style/InGameMenuOption"
-            />
+            android:text="@string/emulation_slot6"
+            style="@style/InGameMenuOption"/>
+
     </GridLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_add_directory.xml b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
index 7bc27379d1..9a1f7c863b 100644
--- a/Source/Android/app/src/main/res/menu/menu_add_directory.xml
+++ b/Source/Android/app/src/main/res/menu/menu_add_directory.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <!-- TODO Please give me an icon! -->
     <item
         android:id="@+id/menu_up_one_level"
         android:title="@string/add_directory_up_one_level"
         app:showAsAction="ifRoom|withText"/>
+
 </menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_emulation.xml b/Source/Android/app/src/main/res/menu/menu_emulation.xml
index ac7cfd6835..0d6f424fe9 100644
--- a/Source/Android/app/src/main/res/menu/menu_emulation.xml
+++ b/Source/Android/app/src/main/res/menu/menu_emulation.xml
@@ -6,47 +6,45 @@
         android:id="@+id/menu_emulation_screenshot"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_screenshot"
-        android:title="@string/overlay_screenshot"/>
+        android:title="@string/emulation_screenshot"/>
 
     <item
         android:id="@+id/menu_quicksave"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_quicksave"
-        android:title="@string/emulation_quicksave"
-        />
+        android:title="@string/emulation_quicksave"/>
 
     <item
         android:id="@+id/menu_quickload"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_quickload"
-        android:title="@string/emulation_quickload"
-        />
+        android:title="@string/emulation_quickload"/>
 
     <!-- Save State Slots -->
     <item
         android:id="@+id/menu_emulation_save_root"
         android:showAsAction="never"
-        android:title="@string/overlay_savestate">
+        android:title="@string/emulation_savestate">
         <menu>
             <item
                 android:id="@+id/menu_emulation_save_1"
-                android:title="@string/overlay_slot1"/>
+                android:title="@string/emulation_slot1"/>
 
             <item
                 android:id="@+id/menu_emulation_save_2"
-                android:title="@string/overlay_slot2"/>
+                android:title="@string/emulation_slot2"/>
 
             <item
                 android:id="@+id/menu_emulation_save_3"
-                android:title="@string/overlay_slot3"/>
+                android:title="@string/emulation_slot3"/>
 
             <item
                 android:id="@+id/menu_emulation_save_4"
-                android:title="@string/overlay_slot4"/>
+                android:title="@string/emulation_slot4"/>
 
             <item
                 android:id="@+id/menu_emulation_save_5"
-                android:title="@string/overlay_slot5"/>
+                android:title="@string/emulation_slot5"/>
         </menu>
     </item>
 
@@ -54,27 +52,27 @@
     <item
         android:id="@+id/menu_emulation_load_root"
         android:showAsAction="never"
-        android:title="@string/overlay_loadstate">
+        android:title="@string/emulation_loadstate">
         <menu>
             <item
                 android:id="@+id/menu_emulation_load_1"
-                android:title="@string/overlay_slot1"/>
+                android:title="@string/emulation_slot1"/>
 
             <item
                 android:id="@+id/menu_emulation_load_2"
-                android:title="@string/overlay_slot2"/>
+                android:title="@string/emulation_slot2"/>
 
             <item
                 android:id="@+id/menu_emulation_load_3"
-                android:title="@string/overlay_slot3"/>
+                android:title="@string/emulation_slot3"/>
 
             <item
                 android:id="@+id/menu_emulation_load_4"
-                android:title="@string/overlay_slot4"/>
+                android:title="@string/emulation_slot4"/>
 
             <item
                 android:id="@+id/menu_emulation_load_5"
-                android:title="@string/overlay_slot5"/>
+                android:title="@string/emulation_slot5"/>
         </menu>
     </item>
 
@@ -96,4 +94,5 @@
                 android:title="@string/emulation_control_scale"/>
         </menu>
     </item>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml b/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
index 34b1b15937..3b8f66acf2 100644
--- a/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
+++ b/Source/Android/app/src/main/res/menu/menu_emulation_wii.xml
@@ -6,47 +6,45 @@
         android:id="@+id/menu_emulation_screenshot"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_screenshot"
-        android:title="@string/overlay_screenshot"/>
+        android:title="@string/emulation_screenshot"/>
 
     <item
         android:id="@+id/menu_quicksave"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_quicksave"
-        android:title="@string/emulation_quicksave"
-        />
+        android:title="@string/emulation_quicksave"/>
 
     <item
         android:id="@+id/menu_quickload"
         android:showAsAction="ifRoom"
         android:icon="@drawable/ic_quickload"
-        android:title="@string/emulation_quickload"
-        />
+        android:title="@string/emulation_quickload"/>
 
     <!-- Save State Slots -->
     <item
         android:id="@+id/menu_emulation_save_root"
         android:showAsAction="never"
-        android:title="@string/overlay_savestate">
+        android:title="@string/emulation_savestate">
         <menu>
             <item
                 android:id="@+id/menu_emulation_save_1"
-                android:title="@string/overlay_slot1"/>
+                android:title="@string/emulation_slot1"/>
 
             <item
                 android:id="@+id/menu_emulation_save_2"
-                android:title="@string/overlay_slot2"/>
+                android:title="@string/emulation_slot2"/>
 
             <item
                 android:id="@+id/menu_emulation_save_3"
-                android:title="@string/overlay_slot3"/>
+                android:title="@string/emulation_slot3"/>
 
             <item
                 android:id="@+id/menu_emulation_save_4"
-                android:title="@string/overlay_slot4"/>
+                android:title="@string/emulation_slot4"/>
 
             <item
                 android:id="@+id/menu_emulation_save_5"
-                android:title="@string/overlay_slot5"/>
+                android:title="@string/emulation_slot5"/>
         </menu>
     </item>
 
@@ -54,27 +52,27 @@
     <item
         android:id="@+id/menu_emulation_load_root"
         android:showAsAction="never"
-        android:title="@string/overlay_loadstate">
+        android:title="@string/emulation_loadstate">
         <menu>
             <item
                 android:id="@+id/menu_emulation_load_1"
-                android:title="@string/overlay_slot1"/>
+                android:title="@string/emulation_slot1"/>
 
             <item
                 android:id="@+id/menu_emulation_load_2"
-                android:title="@string/overlay_slot2"/>
+                android:title="@string/emulation_slot2"/>
 
             <item
                 android:id="@+id/menu_emulation_load_3"
-                android:title="@string/overlay_slot3"/>
+                android:title="@string/emulation_slot3"/>
 
             <item
                 android:id="@+id/menu_emulation_load_4"
-                android:title="@string/overlay_slot4"/>
+                android:title="@string/emulation_slot4"/>
 
             <item
                 android:id="@+id/menu_emulation_load_5"
-                android:title="@string/overlay_slot5"/>
+                android:title="@string/emulation_slot5"/>
         </menu>
     </item>
 
@@ -100,4 +98,5 @@
                 android:title="@string/emulation_choose_controller"/>
         </menu>
     </item>
-</menu>
+
+</menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/menu/menu_game_grid.xml b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
index 112123fce3..696c8716fa 100644
--- a/Source/Android/app/src/main/res/menu/menu_game_grid.xml
+++ b/Source/Android/app/src/main/res/menu/menu_game_grid.xml
@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
+
     <item
         android:id="@+id/menu_settings_core"
         android:title="@string/grid_menu_core_settings"
         android:icon="@drawable/ic_settings_core"
         app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/menu_settings_video"
         android:title="@string/grid_menu_video_settings"
         android:icon="@drawable/ic_settings_graphics"
         app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/menu_settings_gcpad"
         android:title="@string/grid_menu_gcpad_settings"
         android:icon="@drawable/ic_settings_gcpad"
         app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/menu_settings_wiimote"
         android:title="@string/grid_menu_wiimote_settings"
         android:icon="@drawable/ic_settings_wiimote"
         app:showAsAction="ifRoom"/>
+
     <item
         android:id="@+id/menu_refresh"
         android:title="@string/grid_menu_refresh"
diff --git a/Source/Android/app/src/main/res/menu/menu_settings.xml b/Source/Android/app/src/main/res/menu/menu_settings.xml
index 13353030ac..af1aeb8abe 100644
--- a/Source/Android/app/src/main/res/menu/menu_settings.xml
+++ b/Source/Android/app/src/main/res/menu/menu_settings.xml
@@ -7,4 +7,5 @@
         android:title="@string/preferences_exit_no_save"
         android:icon="@drawable/ic_cancel"
         app:showAsAction="ifRoom"/>
+
 </menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/arrays.xml b/Source/Android/app/src/main/res/values/arrays.xml
index 9ecec4e04b..8cd79aa198 100644
--- a/Source/Android/app/src/main/res/values/arrays.xml
+++ b/Source/Android/app/src/main/res/values/arrays.xml
@@ -2,15 +2,16 @@
 
 <!-- All lists for ListPreference keys/values are placed here -->
 <resources>
+
     <!-- New UI CPU Core selection - Default -->
-    <string-array name="string_emu_cores" translatable="false">
-        <item>@string/interpreter</item>
-        <item>@string/cached_interpreter</item>
-        <item>@string/jit_arm64_recompiler</item>
-        <!--<item>@string/jit64_recompiler</item>
-        <item>@string/jitil_recompiler</item>-->
+    <string-array name="emuCoresEntries" translatable="false">
+        <item>Interpreter</item>
+        <item>Cached Interpreter</item>
+        <item>JIT ARM64 Recompiler</item>
+        <!--<item>JIT64 Recompiler</item>
+        <item>JITIL Recompiler</item>-->
     </string-array>
-    <integer-array name="int_emu_cores" translatable="false">
+    <integer-array name="emuCoresValues" translatable="false">
         <item>0</item>
         <item>5</item>
         <item>4</item>
@@ -52,9 +53,9 @@
 
     <!-- Texture Cache Accuracy Preference -->
     <string-array name="textureCacheAccuracyEntries" translatable="false">
-        <item>@string/texture_cache_accuracy_low</item>
-        <item>@string/texture_cache_accuracy_medium</item>
-        <item>@string/texture_cache_accuracy_high</item>
+        <item>Low</item>
+        <item>Medium</item>
+        <item>High</item>
     </string-array>
     <integer-array name="textureCacheAccuracyValues" translatable="false">
         <item>128</item>
@@ -64,9 +65,9 @@
 
     <!-- External Frame Buffer Preference -->
     <string-array name="externalFrameBufferEntries" translatable="false">
-        <item>@string/disabled</item>
-        <item>@string/external_frame_buffer_virtual</item>
-        <item>@string/external_frame_buffer_real</item>
+        <item>Disabled</item>
+        <item>Virtual</item>
+        <item>Real</item>
     </string-array>
     <integer-array name="externalFrameBufferValues" translatable="false">
         <item>0</item>
@@ -152,7 +153,7 @@
         <item>3</item>
     </integer-array>
 
-    <string-array name="country_names">
+    <string-array name="countryNames">
         <item>Europe</item>
         <item>Japan</item>
         <item>USA</item>
diff --git a/Source/Android/app/src/main/res/values/colors.xml b/Source/Android/app/src/main/res/values/colors.xml
index 9052de99d5..ade7fb092d 100644
--- a/Source/Android/app/src/main/res/values/colors.xml
+++ b/Source/Android/app/src/main/res/values/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <color name="dolphin_blue">#2196f3</color>
     <color name="dolphin_blue_dark">#1976d2</color>
 
@@ -10,4 +11,5 @@
     <color name="circle_grey">#bdbdbd</color>
 
     <color name="tv_card_unselected">#444444</color>
+
 </resources>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index bf9f1741bd..0f62d06dff 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -56,17 +56,7 @@
     <!-- Emulation Overlay -->
     <string name="enable_input_overlay">Enable Input Overlay</string>
     <string name="disable_input_overlay">Disable Input Overlay</string>
-    <string name="overlay_screenshot">Take Screenshot</string>
-    <string name="overlay_savestate">Save State</string>
-    <string name="overlay_loadstate">Load State</string>
-    <string name="overlay_exit_emulation">Exit</string>
     <string name="overlay_exit_emulation_confirm">Are you sure you wish to exit this game?</string>
-    <string name="overlay_slot1">Slot 1</string>
-    <string name="overlay_slot2">Slot 2</string>
-    <string name="overlay_slot3">Slot 3</string>
-    <string name="overlay_slot4">Slot 4</string>
-    <string name="overlay_slot5">Slot 5</string>
-    <string name="overlay_slot6">Slot 6</string>
 
     <!-- Input Config Fragment -->
     <string name="input_settings">Input</string>
@@ -93,7 +83,7 @@
     <string name="controller_main">Main Stick Navigation</string>
     <string name="controller_c">C-Stick Navigation</string>
     <string name="controller_trig">Analog Triggers</string>
-	<string name="modifier_range">Modifier Range</string>
+    <string name="modifier_range">Modifier Range</string>
     <string name="analog_radius">Analog Radius (High value = High sensitivity)</string>
     <string name="analog_threshold">Analog Threshold (Low value = High sensitivity)</string>
 
@@ -170,7 +160,7 @@
     <string name="tilt_backward">Tilt Backward</string>
     <string name="tilt_left">Tilt Left</string>
     <string name="tilt_right">Tilt Right</string>
-	<string name="tilt_modifier">Tilt Modifier</string>
+    <string name="tilt_modifier">Tilt Modifier</string>
     <string name="shake_x">Shake X</string>
     <string name="shake_y">Shake Y</string>
     <string name="shake_z">Shake Z</string>
@@ -323,6 +313,7 @@
     <!-- Miscellaneous -->
     <string name="yes">Yes</string>
     <string name="no">No</string>
+    <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="disabled">Disabled</string>
     <string name="other">Other</string>
@@ -355,6 +346,16 @@
     <string name="dialog_seekbar_neg">Cancel</string>
 
     <!-- Emulation Menu -->
+    <string name="emulation_screenshot">Take Screenshot</string>
+    <string name="emulation_savestate">Save State</string>
+    <string name="emulation_loadstate">Load State</string>
+    <string name="emulation_exit">Exit</string>
+    <string name="emulation_slot1">Slot 1</string>
+    <string name="emulation_slot2">Slot 2</string>
+    <string name="emulation_slot3">Slot 3</string>
+    <string name="emulation_slot4">Slot 4</string>
+    <string name="emulation_slot5">Slot 5</string>
+    <string name="emulation_slot6">Slot 6</string>
     <string name="emulation_quicksave">Quick Save</string>
     <string name="emulation_quickload">Quick Load</string>
     <string name="emulation_refresh_wiimotes">Refresh Wiimotes</string>
diff --git a/Source/Android/app/src/main/res/values/styles.xml b/Source/Android/app/src/main/res/values/styles.xml
index 7a6f9f126c..6a411910ab 100644
--- a/Source/Android/app/src/main/res/values/styles.xml
+++ b/Source/Android/app/src/main/res/values/styles.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- inherit from the material theme -->
+
+    <!-- Inherit from the material theme -->
     <style name="DolphinBase" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Main theme colors -->
-        <!--   your app branding color for the app bar -->
+        <!-- Branding color for the app bar -->
         <item name="colorPrimary">@color/dolphin_blue</item>
-        <!--   darker variant for the status bar and contextual app bars -->
+        <!-- Darker variant for the status bar and contextual app bars -->
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
 
-        <!--enable window content transitions-->
+        <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
@@ -22,9 +23,9 @@
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
     </style>
 
-    <!-- Inherit from the Base Dolphin Theme-->
+    <!-- Inherit from the Base Dolphin Theme -->
     <style name="DolphinWii" parent="DolphinBase">
-        <!--   theme UI controls like checkboxes and text fields -->
+        <!-- Theme UI controls like checkboxes and text fields -->
         <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
 
@@ -36,7 +37,7 @@
         <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
-    <!-- Inherit from the Base Dolphin Settings Theme-->
+    <!-- Inherit from the Base Dolphin Settings Theme -->
     <style name="DolphinSettingsWii" parent="DolphinSettingsBase">
         <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
@@ -46,7 +47,7 @@
     </style>
 
     <style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
-        <!--   theme UI controls like checkboxes and text fields -->
+        <!-- Theme UI controls like checkboxes and text fields -->
         <item name="colorAccent">@color/dolphin_accent_wiiware</item>
     </style>
 
@@ -56,7 +57,7 @@
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
     </style>
 
-    <!-- Inherit from the Base Dolphin Dialog Theme-->
+    <!-- Inherit from the Base Dolphin Dialog Theme -->
     <style name="DolphinDialogWii" parent="DolphinDialogBase">
         <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
@@ -76,13 +77,13 @@
 
         <item name="android:windowBackground">@android:color/black</item>
 
-        <!--enable window content transitions-->
+        <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
     </style>
 
-    <!-- Inherit from the Base Dolphin Emulation Theme-->
+    <!-- Inherit from the Base Dolphin Emulation Theme -->
     <style name="DolphinEmulationWii" parent="DolphinEmulationBase">
         <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
@@ -102,13 +103,13 @@
 
         <item name="android:windowBackground">@android:color/black</item>
 
-        <!--enable window content transitions-->
+        <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
     </style>
 
-    <!-- Inherit from the Base Dolphin Emulation Theme-->
+    <!-- Inherit from the Base Dolphin Emulation Theme -->
     <style name="DolphinEmulationTvWii" parent="DolphinEmulationTvBase">
         <item name="colorAccent">@color/dolphin_accent_wii</item>
     </style>
@@ -131,7 +132,7 @@
         <item name="colorPrimary">@color/dolphin_blue</item>
         <item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
 
-        <!--enable window content transitions-->
+        <!-- Enable window content transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>