diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
index 14d7c5a79..62ed3da9c 100644
--- a/Android/app/src/main/AndroidManifest.xml
+++ b/Android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="emu.project64" android:versionCode="11" android:versionName="2.3.3" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="emu.project64">
     
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
diff --git a/Source/Android/Bridge/JavaBridge.h b/Source/Android/Bridge/JavaBridge.h
index 903c21d21..6294f59f5 100644
--- a/Source/Android/Bridge/JavaBridge.h
+++ b/Source/Android/Bridge/JavaBridge.h
@@ -2,7 +2,7 @@
 
 #ifdef ANDROID
 
-#include <Project64-core/Plugins/PluginClass.h>
+#include <Project64-core/Plugins/Plugin.h>
 #include <jni.h>
 
 class JavaBridge :
diff --git a/Source/Android/Bridge/jniBridge.cpp b/Source/Android/Bridge/jniBridge.cpp
index 6f8aa5702..5f098db5c 100644
--- a/Source/Android/Bridge/jniBridge.cpp
+++ b/Source/Android/Bridge/jniBridge.cpp
@@ -4,7 +4,6 @@
 #include <sys/inotify.h>
 #include <sys/file.h>
 #endif
-#include "Notification.h"
 #include <Project64-core/AppInit.h>
 #include <Project64-core/Version.h>
 #include <Project64-core/TraceModulesProject64.h>
@@ -15,12 +14,14 @@
 #include <Project64-core/Plugin.h>
 #include <Common/Trace.h>
 #include <Common/Thread.h>
+#include <Common/StdString.h>
 #include "jniBridge.h"
 #include "jniBridgeSettings.h"
 #include "JavaBridge.h"
 #include "SyncBridge.h"
 #include "UISettings.h"
 #include "JavaRomList.h"
+#include "Notification.h"
 
 #ifdef _WIN32
 #define EXPORT      extern "C" __declspec(dllexport)
@@ -53,7 +54,7 @@ class AndroidLogger : public CTraceModule
     }
 };
 
-CJniBridegSettings * JniBridegSettings = NULL;
+std::unique_ptr<CJniBridegSettings> JniBridegSettings;
 CJavaRomList * g_JavaRomList = NULL;
 AndroidLogger * g_Logger = NULL;
 static pthread_key_t g_ThreadKey;
@@ -251,7 +252,7 @@ EXPORT jboolean CALL Java_emu_project64_jni_NativeExports_appInit(JNIEnv* env, j
         g_SyncBridge = new SyncBridge(g_JavaBridge);
         g_Plugins->SetRenderWindows(g_JavaBridge, g_SyncBridge);
 
-        JniBridegSettings = new CJniBridegSettings();
+        JniBridegSettings.reset(new CJniBridegSettings());
 
         RegisterUISettings();
         g_Settings->RegisterChangeCB(GameRunning_CPU_Running, NULL, (CSettings::SettingChangedFunc)GameCpuRunning);
@@ -268,48 +269,86 @@ EXPORT jstring CALL Java_emu_project64_jni_NativeExports_appVersion(JNIEnv* env,
     return env->NewStringUTF(VER_FILE_VERSION_STR);
 }
 
-EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveBool(JNIEnv* env, jclass cls, int Type, jboolean Value)
+EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveBool(JNIEnv* env, jclass cls, jstring Type, jboolean Value)
 {
-    WriteTrace(TraceUserInterface, TraceDebug, "Saving %d value: %s", Type, Value ? "true" : "false");
-    g_Settings->SaveBool((SettingID)Type, Value);
-    CSettings::FlushSettings(g_Settings);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    WriteTrace(TraceUserInterface, TraceDebug, "Saving %s value: %s", szType, Value ? "true" : "false");
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    if (Id != Default_None)
+    {
+        g_Settings->SaveBool(Id, Value);
+        CSettings::FlushSettings(g_Settings);
+    }
     WriteTrace(TraceUserInterface, TraceDebug, "Saved");
 }
 
-EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveDword(JNIEnv* env, jclass cls, int Type, int Value)
+EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveDword(JNIEnv* env, jclass cls, jstring Type, int Value)
 {
-    WriteTrace(TraceUserInterface, TraceDebug, "Saving %d value: 0x%X", Type, Value);
-    g_Settings->SaveDword((SettingID)Type, Value);
-    CSettings::FlushSettings(g_Settings);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    WriteTrace(TraceUserInterface, TraceDebug, "Saving %s value: 0x%X", szType, Value);
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    if (Id != Default_None)
+    {
+        g_Settings->SaveDword(Id, Value);
+        CSettings::FlushSettings(g_Settings);
+    }
+    WriteTrace(TraceUserInterface, TraceDebug, "Saved");
+    env->ReleaseStringUTFChars(Type, szType);
+}
+
+EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveString(JNIEnv* env, jclass cls, jstring Type, jstring Buffer)
+{
+    const char * szBuffer = env->GetStringUTFChars(Buffer, 0);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    WriteTrace(TraceUserInterface, TraceDebug, "Saving %s value: %s", szType, szBuffer);
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    if (Id != Default_None)
+    {
+        g_Settings->SaveString(Id, szBuffer);
+        CSettings::FlushSettings(g_Settings);
+    }
+    env->ReleaseStringUTFChars(Buffer, szBuffer);
+    env->ReleaseStringUTFChars(Type, szType);
     WriteTrace(TraceUserInterface, TraceDebug, "Saved");
 }
 
-EXPORT void CALL Java_emu_project64_jni_NativeExports_SettingsSaveString(JNIEnv* env, jclass cls, int Type, jstring Buffer)
+EXPORT jboolean CALL Java_emu_project64_jni_NativeExports_SettingsLoadBool(JNIEnv* env, jclass cls, jstring Type)
 {
-    const char *value = env->GetStringUTFChars(Buffer, 0);
-    WriteTrace(TraceUserInterface, TraceDebug, "Saving %d value: %s", Type, value);
-    g_Settings->SaveString((SettingID)Type, value);
-    CSettings::FlushSettings(g_Settings);
-    WriteTrace(TraceUserInterface, TraceDebug, "Saved");
-    env->ReleaseStringUTFChars(Buffer, value);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    env->ReleaseStringUTFChars(Type, szType);
+    if (Id != Default_None)
+    {
+        return g_Settings->LoadBool(Id);
+    }
+    return false;
 }
 
-EXPORT jboolean CALL Java_emu_project64_jni_NativeExports_SettingsLoadBool(JNIEnv* env, jclass cls, int Type)
+EXPORT jint CALL Java_emu_project64_jni_NativeExports_SettingsLoadDword(JNIEnv* env, jclass cls, jstring Type)
 {
-    return g_Settings->LoadBool((SettingID)Type);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    env->ReleaseStringUTFChars(Type, szType);
+    if (Id != Default_None)
+    {
+        return g_Settings->LoadDword(Id);
+    }
+    return 0;
 }
 
-EXPORT jint CALL Java_emu_project64_jni_NativeExports_SettingsLoadDword(JNIEnv* env, jclass cls, int Type)
+EXPORT jstring CALL Java_emu_project64_jni_NativeExports_SettingsLoadString(JNIEnv* env, jclass cls, jstring Type)
 {
-    return g_Settings->LoadDword((SettingID)Type);
+    const char * szType = env->GetStringUTFChars(Type, 0);
+    SettingID Id = JniBridegSettings->TranslateSettingID(szType);
+    env->ReleaseStringUTFChars(Type, szType);
+    if (Id != Default_None)
+    {
+        return env->NewStringUTF(g_Settings->LoadStringVal(Id).c_str());
+    }
+    return env->NewStringUTF("");
 }
 
-EXPORT jstring CALL Java_emu_project64_jni_NativeExports_SettingsLoadString(JNIEnv* env, jclass cls, int Type)
-{
-    return env->NewStringUTF(g_Settings->LoadStringVal((SettingID)Type).c_str());
-}
-
-EXPORT jboolean CALL Java_emu_project64_jni_NativeExports_IsSettingSet(JNIEnv* env, jclass cls, int Type)
+EXPORT jboolean CALL Java_emu_project64_jni_NativeExports_IsSettingSet(JNIEnv* env, jclass cls, jstring Type)
 {
     return g_Settings->IsSettingSet((SettingID)Type);
 }
@@ -566,7 +605,7 @@ static void Android_JNI_ThreadDestroyed(void* value)
 JNIEnv* Android_JNI_GetEnv(void)
 {
     /*
-	* From http://developer.android.com/guide/practices/jni.html
+    * From http://developer.android.com/guide/practices/jni.html
     * All threads are Linux threads, scheduled by the kernel.
     * They're usually started from managed code (using Thread.start), but they can also be created elsewhere and then
     * attached to the Java VM. For example, a thread started with pthread_create can be attached with the
diff --git a/Source/Android/Bridge/jniBridgeSettings.cpp b/Source/Android/Bridge/jniBridgeSettings.cpp
index 3d15d9514..789062b33 100644
--- a/Source/Android/Bridge/jniBridgeSettings.cpp
+++ b/Source/Android/Bridge/jniBridgeSettings.cpp
@@ -1,7 +1,7 @@
 #include "jniBridgeSettings.h"
 #include <Project64-core/Settings.h>
 
-int  CJniBridegSettings::m_RefCount = 0; 
+int CJniBridegSettings::m_RefCount = 0; 
 bool CJniBridegSettings::m_bCPURunning; 
 
 CJniBridegSettings::CJniBridegSettings()
@@ -12,6 +12,325 @@ CJniBridegSettings::CJniBridegSettings()
 		g_Settings->RegisterChangeCB(GameRunning_CPU_Running,NULL,RefreshSettings);
 		RefreshSettings(NULL);
 	}
+
+#define ADD_SETTING(ID) m_SettingNameList.insert(SettingNameList::value_type(#ID,ID));
+
+	ADD_SETTING(Cmd_BaseDirectory);
+	ADD_SETTING(Cmd_RomFile);
+	ADD_SETTING(Cmd_ComboDiskFile);
+	ADD_SETTING(Cmd_ShowHelp);
+
+	// Support files
+	ADD_SETTING(SupportFile_Settings);
+	ADD_SETTING(SupportFile_SettingsDefault);
+	ADD_SETTING(SupportFile_RomDatabase);
+	ADD_SETTING(SupportFile_RomDatabaseDefault);
+	ADD_SETTING(SupportFile_VideoRDB);
+	ADD_SETTING(SupportFile_VideoRDBDefault);
+	ADD_SETTING(SupportFile_AudioRDB);
+	ADD_SETTING(SupportFile_AudioRDBDefault);
+	ADD_SETTING(SupportFile_CheatDir);
+	ADD_SETTING(SupportFile_CheatDirDefault);
+	ADD_SETTING(SupportFile_UserCheatDir);
+	ADD_SETTING(SupportFile_UserCheatDirDefault);
+	ADD_SETTING(SupportFile_EnhancementDir);
+	ADD_SETTING(SupportFile_EnhancementDirDefault);
+	ADD_SETTING(SupportFile_UserEnhancementDir);
+	ADD_SETTING(SupportFile_UserEnhancementDirDefault);
+	ADD_SETTING(SupportFile_Notes);
+	ADD_SETTING(SupportFile_NotesDefault);
+	ADD_SETTING(SupportFile_ExtInfo);
+	ADD_SETTING(SupportFile_ExtInfoDefault);
+
+	// Settings
+	ADD_SETTING(Setting_ApplicationName);
+	ADD_SETTING(Setting_UseFromRegistry);
+	ADD_SETTING(Setting_RdbEditor);
+	ADD_SETTING(Setting_CN64TimeCritical);
+	ADD_SETTING(Setting_AutoStart);
+	ADD_SETTING(Setting_CheckEmuRunning);
+	ADD_SETTING(Setting_EraseGameDefaults);
+	ADD_SETTING(Setting_ForceInterpreterCPU);
+	ADD_SETTING(Setting_FixedRdramAddress);
+
+	ADD_SETTING(Setting_AutoZipInstantSave);
+	ADD_SETTING(Setting_RememberCheats);
+	ADD_SETTING(Setting_UniqueSaveDir);
+	ADD_SETTING(Setting_LanguageDir);
+	ADD_SETTING(Setting_LanguageDirDefault);
+	ADD_SETTING(Setting_CurrentLanguage);
+	ADD_SETTING(Setting_EnableDisk);
+	ADD_SETTING(Setting_SyncViaAudioEnabled);
+	ADD_SETTING(Setting_Enhancement);
+	ADD_SETTING(Setting_DiskSaveType);
+
+	// Default settings
+	ADD_SETTING(Default_RDRamSize);
+	ADD_SETTING(Default_UseHleGfx);
+	ADD_SETTING(Default_UseTlb);
+	ADD_SETTING(Default_ViRefreshRate);
+	ADD_SETTING(Default_AiCountPerBytes);
+	ADD_SETTING(Default_CounterFactor);
+	ADD_SETTING(Default_32Bit);
+	ADD_SETTING(Default_SyncViaAudio);
+	ADD_SETTING(Default_FixedAudio);
+	ADD_SETTING(Default_UnalignedDMA);
+	ADD_SETTING(Default_RandomizeSIPIInterrupts);
+	ADD_SETTING(Default_SMM_Protect_Memory);
+	ADD_SETTING(Default_DiskSeekTiming);
+
+	// RDB settings
+	ADD_SETTING(Rdb_GoodName);
+	ADD_SETTING(Rdb_SaveChip);
+	ADD_SETTING(Rdb_CpuType);
+	ADD_SETTING(Rdb_RDRamSize);
+	ADD_SETTING(Rdb_CounterFactor);
+	ADD_SETTING(Rdb_UseTlb);
+	ADD_SETTING(Rdb_DelayDP);
+	ADD_SETTING(Rdb_DelaySi);
+	ADD_SETTING(Rdb_32Bit);
+	ADD_SETTING(Rdb_FastSP);
+	ADD_SETTING(Rdb_FixedAudio);
+	ADD_SETTING(Rdb_SyncViaAudio);
+	ADD_SETTING(Rdb_RspAudioSignal);
+	ADD_SETTING(Rdb_TLB_VAddrStart);
+	ADD_SETTING(Rdb_TLB_VAddrLen);
+	ADD_SETTING(Rdb_TLB_PAddrStart);
+	ADD_SETTING(Rdb_UseHleGfx);
+	ADD_SETTING(Rdb_UseHleAudio);
+	ADD_SETTING(Rdb_LoadRomToMemory);
+	ADD_SETTING(Rdb_ScreenHertz);
+	ADD_SETTING(Rdb_FuncLookupMode);
+	ADD_SETTING(Rdb_RegCache);
+	ADD_SETTING(Rdb_BlockLinking);
+	ADD_SETTING(Rdb_SMM_StoreInstruc);
+	ADD_SETTING(Rdb_SMM_Cache);
+	ADD_SETTING(Rdb_SMM_PIDMA);
+	ADD_SETTING(Rdb_SMM_TLB);
+	ADD_SETTING(Rdb_SMM_Protect);
+	ADD_SETTING(Rdb_SMM_ValidFunc);
+	ADD_SETTING(Rdb_ViRefreshRate);
+	ADD_SETTING(Rdb_AiCountPerBytes);
+	ADD_SETTING(Rdb_AudioResetOnLoad);
+	ADD_SETTING(Rdb_AllowROMWrites);
+	ADD_SETTING(Rdb_CRC_Recalc);
+	ADD_SETTING(Rdb_UnalignedDMA);
+	ADD_SETTING(Rdb_RandomizeSIPIInterrupts);
+	ADD_SETTING(Rdb_RPCKey);
+	ADD_SETTING(Rdb_DiskSeekTiming);
+
+	// Individual game settings
+	ADD_SETTING(Game_IniKey);
+	ADD_SETTING(Game_File);
+	ADD_SETTING(Game_UniqueSaveDir);
+	ADD_SETTING(Game_GameName);
+	ADD_SETTING(Cfg_GoodName);
+	ADD_SETTING(Game_TempLoaded);
+	ADD_SETTING(Game_SystemType);
+	ADD_SETTING(Game_EditPlugin_Gfx);
+	ADD_SETTING(Game_EditPlugin_Audio);
+	ADD_SETTING(Game_EditPlugin_Contr);
+	ADD_SETTING(Game_EditPlugin_RSP);
+	ADD_SETTING(Game_Plugin_Gfx);
+	ADD_SETTING(Game_Plugin_Audio);
+	ADD_SETTING(Game_Plugin_Controller);
+	ADD_SETTING(Game_Plugin_RSP);
+	ADD_SETTING(Game_SaveChip);
+	ADD_SETTING(Game_CpuType);
+	ADD_SETTING(Game_LastSaveSlot);
+	ADD_SETTING(Game_FixedAudio);
+	ADD_SETTING(Game_SyncViaAudio);
+	ADD_SETTING(Game_32Bit);
+	ADD_SETTING(Game_SMM_Cache);
+	ADD_SETTING(Game_SMM_Protect);
+	ADD_SETTING(Game_SMM_ValidFunc);
+	ADD_SETTING(Game_SMM_PIDMA);
+	ADD_SETTING(Game_SMM_TLB);
+	ADD_SETTING(Game_SMM_StoreInstruc);
+	ADD_SETTING(Game_CurrentSaveState);
+	ADD_SETTING(Game_LastSaveTime);
+	ADD_SETTING(Game_RDRamSize);
+	ADD_SETTING(Game_CounterFactor);
+	ADD_SETTING(Game_UseTlb);
+	ADD_SETTING(Game_DelayDP);
+	ADD_SETTING(Game_DelaySI);
+	ADD_SETTING(Game_FastSP);
+	ADD_SETTING(Game_FuncLookupMode);
+	ADD_SETTING(Game_RegCache);
+	ADD_SETTING(Game_BlockLinking);
+	ADD_SETTING(Game_ScreenHertz);
+	ADD_SETTING(Game_RspAudioSignal);
+	ADD_SETTING(Game_UseHleGfx);
+	ADD_SETTING(Game_UseHleAudio);
+	ADD_SETTING(Game_LoadRomToMemory);
+	ADD_SETTING(Game_ViRefreshRate);
+	ADD_SETTING(Game_AiCountPerBytes);
+	ADD_SETTING(Game_AudioResetOnLoad);
+	ADD_SETTING(Game_AllowROMWrites);
+	ADD_SETTING(Game_CRC_Recalc);
+	ADD_SETTING(Game_Transferpak_ROM);
+	ADD_SETTING(Game_Transferpak_Sav);
+	ADD_SETTING(Game_LoadSaveAtStart);
+	ADD_SETTING(Game_OverClockModifier);
+	ADD_SETTING(Game_FullSpeed);
+	ADD_SETTING(Game_UnalignedDMA);
+	ADD_SETTING(Game_RandomizeSIPIInterrupts);
+	ADD_SETTING(Game_RPCKey);
+	ADD_SETTING(Game_DiskSeekTiming);
+
+	// General game running info
+	ADD_SETTING(GameRunning_LoadingInProgress);
+	ADD_SETTING(GameRunning_CPU_Running);
+	ADD_SETTING(GameRunning_CPU_Paused);
+	ADD_SETTING(GameRunning_CPU_PausedType);
+	ADD_SETTING(GameRunning_InstantSaveFile);
+	ADD_SETTING(GameRunning_LimitFPS);
+	ADD_SETTING(GameRunning_ScreenHertz);
+	ADD_SETTING(GameRunning_InReset);
+
+	// User interface
+	ADD_SETTING(UserInterface_BasicMode);
+	ADD_SETTING(UserInterface_ShowCPUPer);
+	ADD_SETTING(UserInterface_DisplayFrameRate);
+	ADD_SETTING(UserInterface_FrameDisplayType);
+
+	// Directory info
+	ADD_SETTING(Directory_Plugin);
+	ADD_SETTING(Directory_PluginInitial);
+	ADD_SETTING(Directory_PluginSelected);
+	ADD_SETTING(Directory_PluginUseSelected);
+	ADD_SETTING(Directory_PluginSync);
+	ADD_SETTING(Directory_PluginSyncInitial);
+	ADD_SETTING(Directory_PluginSyncSelected);
+	ADD_SETTING(Directory_PluginSyncUseSelected);
+	ADD_SETTING(Directory_SnapShot);
+	ADD_SETTING(Directory_SnapShotInitial);
+	ADD_SETTING(Directory_SnapShotSelected);
+	ADD_SETTING(Directory_SnapShotUseSelected);
+	ADD_SETTING(Directory_NativeSave);
+	ADD_SETTING(Directory_NativeSaveInitial);
+	ADD_SETTING(Directory_NativeSaveSelected);
+	ADD_SETTING(Directory_NativeSaveUseSelected);
+	ADD_SETTING(Directory_InstantSave);
+	ADD_SETTING(Directory_InstantSaveInitial);
+	ADD_SETTING(Directory_InstantSaveSelected);
+	ADD_SETTING(Directory_InstantSaveUseSelected);
+	ADD_SETTING(Directory_Texture);
+	ADD_SETTING(Directory_TextureInitial);
+	ADD_SETTING(Directory_TextureSelected);
+	ADD_SETTING(Directory_TextureUseSelected);
+	ADD_SETTING(Directory_Log);
+	ADD_SETTING(Directory_LogInitial);
+	ADD_SETTING(Directory_LogSelected);
+	ADD_SETTING(Directory_LogUseSelected);
+
+	// ROM list
+	ADD_SETTING(RomList_RomListCache);
+	ADD_SETTING(RomList_RomListCacheDefault);
+	ADD_SETTING(RomList_GameDir);
+	ADD_SETTING(RomList_GameDirInitial);
+	ADD_SETTING(RomList_GameDirSelected);
+	ADD_SETTING(RomList_GameDirUseSelected);
+	ADD_SETTING(RomList_GameDirRecursive);
+	ADD_SETTING(RomList_ShowFileExtensions);
+	ADD_SETTING(RomList_7zipCache);
+	ADD_SETTING(RomList_7zipCacheDefault);
+
+	// File info
+	ADD_SETTING(File_DiskIPLPath);
+	ADD_SETTING(File_DiskIPLUSAPath);
+	ADD_SETTING(File_DiskIPLTOOLPath);
+
+	// Debugger
+	ADD_SETTING(Debugger_Enabled);
+	ADD_SETTING(Debugger_ShowTLBMisses);
+	ADD_SETTING(Debugger_ShowUnhandledMemory);
+	ADD_SETTING(Debugger_ShowPifErrors);
+	ADD_SETTING(Debugger_ShowDivByZero);
+	ADD_SETTING(Debugger_RecordRecompilerAsm);
+	ADD_SETTING(Debugger_DisableGameFixes);
+	ADD_SETTING(Debugger_AppLogLevel);
+	ADD_SETTING(Debugger_AppLogFlush);
+	ADD_SETTING(Debugger_ShowDListAListCount);
+	ADD_SETTING(Debugger_ShowRecompMemSize);
+	ADD_SETTING(Debugger_DebugLanguage);
+	ADD_SETTING(Debugger_RecordExecutionTimes);
+	ADD_SETTING(Debugger_SteppingOps);
+	ADD_SETTING(Debugger_SkipOp);
+	ADD_SETTING(Debugger_HaveExecutionBP);
+	ADD_SETTING(Debugger_WriteBPExists);
+	ADD_SETTING(Debugger_ReadBPExists);
+	ADD_SETTING(Debugger_WaitingForStep);
+	ADD_SETTING(Debugger_CPULoggingEnabled);
+	ADD_SETTING(Debugger_CPULogBufferSize);
+	ADD_SETTING(Debugger_ExceptionBreakpoints);
+	ADD_SETTING(Debugger_FpExceptionBreakpoints);
+	ADD_SETTING(Debugger_IntrBreakpoints);
+	ADD_SETTING(Debugger_RcpIntrBreakpoints);
+
+	// Trace
+	ADD_SETTING(Debugger_TraceMD5);
+	ADD_SETTING(Debugger_TraceThread);
+	ADD_SETTING(Debugger_TracePath);
+	ADD_SETTING(Debugger_TraceSettings);
+	ADD_SETTING(Debugger_TraceUnknown);
+	ADD_SETTING(Debugger_TraceAppInit);
+	ADD_SETTING(Debugger_TraceAppCleanup);
+	ADD_SETTING(Debugger_TraceN64System);
+	ADD_SETTING(Debugger_TracePlugins);
+	ADD_SETTING(Debugger_TraceGFXPlugin);
+	ADD_SETTING(Debugger_TraceAudioPlugin);
+	ADD_SETTING(Debugger_TraceControllerPlugin);
+	ADD_SETTING(Debugger_TraceRSPPlugin);
+	ADD_SETTING(Debugger_TraceRSP);
+	ADD_SETTING(Debugger_TraceAudio);
+	ADD_SETTING(Debugger_TraceRegisterCache);
+	ADD_SETTING(Debugger_TraceRecompiler);
+	ADD_SETTING(Debugger_TraceTLB);
+	ADD_SETTING(Debugger_TraceProtectedMEM);
+	ADD_SETTING(Debugger_TraceUserInterface);
+	ADD_SETTING(Debugger_TraceRomList);
+	ADD_SETTING(Debugger_TraceExceptionHandler);
+
+	// Plugins
+	ADD_SETTING(Plugin_RSP_Current);
+	ADD_SETTING(Plugin_RSP_CurVer);
+	ADD_SETTING(Plugin_GFX_Default);
+	ADD_SETTING(Plugin_GFX_Current);
+	ADD_SETTING(Plugin_GFX_CurVer);
+	ADD_SETTING(Plugin_AUDIO_Current);
+	ADD_SETTING(Plugin_AUDIO_CurVer);
+	ADD_SETTING(Plugin_CONT_Current);
+	ADD_SETTING(Plugin_CONT_CurVer);
+	ADD_SETTING(Plugin_UseHleGfx);
+	ADD_SETTING(Plugin_UseHleAudio);
+	ADD_SETTING(Plugin_EnableAudio);
+
+	ADD_SETTING(Logging_GenerateLog);
+	ADD_SETTING(Logging_LogRDRamRegisters);
+	ADD_SETTING(Logging_LogSPRegisters);
+	ADD_SETTING(Logging_LogDPCRegisters);
+	ADD_SETTING(Logging_LogDPSRegisters);
+	ADD_SETTING(Logging_LogMIPSInterface);
+	ADD_SETTING(Logging_LogVideoInterface);
+	ADD_SETTING(Logging_LogAudioInterface);
+	ADD_SETTING(Logging_LogPerInterface);
+	ADD_SETTING(Logging_LogRDRAMInterface);
+	ADD_SETTING(Logging_LogSerialInterface);
+	ADD_SETTING(Logging_LogPRDMAOperations);
+	ADD_SETTING(Logging_LogPRDirectMemLoads);
+	ADD_SETTING(Logging_LogPRDMAMemLoads);
+	ADD_SETTING(Logging_LogPRDirectMemStores);
+	ADD_SETTING(Logging_LogPRDMAMemStores);
+	ADD_SETTING(Logging_LogControllerPak);
+	ADD_SETTING(Logging_LogCP0changes);
+	ADD_SETTING(Logging_LogCP0reads);
+	ADD_SETTING(Logging_LogTLB);
+	ADD_SETTING(Logging_LogExceptions);
+	ADD_SETTING(Logging_NoInterrupts);
+	ADD_SETTING(Logging_LogCache);
+	ADD_SETTING(Logging_LogRomHeader);
+	ADD_SETTING(Logging_LogUnknown);
 }
 
 CJniBridegSettings::~CJniBridegSettings()
@@ -27,3 +346,13 @@ void CJniBridegSettings::RefreshSettings(void *)
 {
 	m_bCPURunning  = g_Settings->LoadBool(GameRunning_CPU_Running);
 }
+
+SettingID CJniBridegSettings::TranslateSettingID(const char * SettingName)
+{
+	SettingNameList::iterator itr = m_SettingNameList.find(SettingName);
+	if (itr != m_SettingNameList.end())
+	{
+		return itr->second;
+	}
+	return Default_None;
+}
diff --git a/Source/Android/Bridge/jniBridgeSettings.h b/Source/Android/Bridge/jniBridgeSettings.h
index e3ae66808..bc00d7411 100644
--- a/Source/Android/Bridge/jniBridgeSettings.h
+++ b/Source/Android/Bridge/jniBridgeSettings.h
@@ -13,5 +13,5 @@ private:
 
 	static bool m_bCPURunning;
 	
-	static int  m_RefCount;
+	static int m_RefCount;
 };