diff --git a/.gitignore b/.gitignore
index b6c540765..9c2c9cbc2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ shell/android/tools
 # iOS/Xcode general stuff
 .DS_Store
 */build/*
+**/build/*
 *.pbxuser
 !default.pbxuser
 *.mode1v3
diff --git a/core/rec-ARM/ngen_arm.S b/core/rec-ARM/ngen_arm.S
index 38f027a3e..590393689 100644
--- a/core/rec-ARM/ngen_arm.S
+++ b/core/rec-ARM/ngen_arm.S
@@ -41,7 +41,11 @@ MOV     R1, #1
 B       _Z8YUV_dataPjj	
 
 TAWriteSQ_vram:				@vram write ..
+#ifdef TARGET_IPHONE
+bkpt #0
+#else
 bkpt
+#endif
 ubfx r0,r3,#5,#18		@ get vram offset
 add r3,r1,#0x04000000	@ get vram ptr from r1, part 1
 add r3,#512				@ get ram ptr from r1, part 2
@@ -157,13 +161,23 @@ arm_compilecode:
 bl CompileCode
 b arm_dispatch
 
+#ifdef TARGET_IPHONE
+Xarm_Reg: .word arm_Reg
+XEntryPoints: .word EntryPoints
+#endif
+
 .global arm_mainloop
 arm_mainloop: @(cntx,lookup_base,cycles)
 
 push {r4,r5,r8,r9,lr}
 
+	#ifdef TARGET_IPHONE
+	ldr r8,Xarm_Reg			@load cntx
+	ldr r4,XEntryPoints		@load lookup base
+    #else
 	ldr r8,=arm_Reg			@load cntx
 	ldr r4,=EntryPoints		@load lookup base
+	#endif
 
 	ldr r5,[r8,#192]	@load cycle count
 	add r5,r0			@add cycles for this timeslice
@@ -172,7 +186,12 @@ push {r4,r5,r8,r9,lr}
 
 .global arm_dispatch
 arm_dispatch:
+	#ifdef TARGET_IPHONE
+	ldrd r0,r1,[r8,#184]		@load: Next PC, interrupt
+	#else
 	ldrd r0,[r8,#184]		@load: Next PC, interrupt
+	#endif
+
 	ubfx r2,r0,#2,#19
 	cmp r1,#0
 	bne arm_dofiq
diff --git a/core/rend/gles/gles.h b/core/rend/gles/gles.h
index 9b1097376..c1cadee72 100755
--- a/core/rend/gles/gles.h
+++ b/core/rend/gles/gles.h
@@ -1,9 +1,14 @@
 #pragma once
 #include "rend/rend.h"
 
-#include <EGL/egl.h>
+#ifdef TARGET_IPHONE //apple-specific ogles2 headers
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#else
+#include <EGL/egl.h
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
+#endif
 
 #ifndef GL_NV_draw_path
 //IMGTEC GLES emulation
diff --git a/shell/ios/emulator.xcodeproj/project.pbxproj b/shell/ios/emulator.xcodeproj/project.pbxproj
index 1644ade19..39fd08bd5 100644
--- a/shell/ios/emulator.xcodeproj/project.pbxproj
+++ b/shell/ios/emulator.xcodeproj/project.pbxproj
@@ -110,9 +110,6 @@
 		9C7A3AFA18C806E00070BB5F /* trees.c in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39C818C806DF0070BB5F /* trees.c */; };
 		9C7A3AFB18C806E00070BB5F /* uncompr.c in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39CA18C806DF0070BB5F /* uncompr.c */; };
 		9C7A3AFC18C806E00070BB5F /* zutil.c in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39CE18C806DF0070BB5F /* zutil.c */; };
-		9C7A3AFD18C806E00070BB5F /* emitter.vcxproj in Resources */ = {isa = PBXBuildFile; fileRef = 9C7A39D118C806DF0070BB5F /* emitter.vcxproj */; };
-		9C7A3AFE18C806E00070BB5F /* emitter.vcxproj.user in Resources */ = {isa = PBXBuildFile; fileRef = 9C7A39D218C806DF0070BB5F /* emitter.vcxproj.user */; };
-		9C7A3AFF18C806E00070BB5F /* x86_emitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39D818C806DF0070BB5F /* x86_emitter.cpp */; };
 		9C7A3B0018C806E00070BB5F /* aica.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39E018C806DF0070BB5F /* aica.cpp */; };
 		9C7A3B0118C806E00070BB5F /* aica_if.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39E218C806DF0070BB5F /* aica_if.cpp */; };
 		9C7A3B0218C806E00070BB5F /* aica_mem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A39E418C806DF0070BB5F /* aica_mem.cpp */; };
@@ -172,9 +169,6 @@
 		9C7A3B3818C806E00070BB5F /* gdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A6018C806E00070BB5F /* gdi.cpp */; };
 		9C7A3B3918C806E00070BB5F /* ImgReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A6118C806E00070BB5F /* ImgReader.cpp */; };
 		9C7A3B3A18C806E00070BB5F /* ioctl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A6318C806E00070BB5F /* ioctl.cpp */; };
-		9C7A3B3B18C806E00070BB5F /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7518C806E00070BB5F /* common.cpp */; };
-		9C7A3B3C18C806E00070BB5F /* nixprof.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7618C806E00070BB5F /* nixprof.cpp */; };
-		9C7A3B3D18C806E00070BB5F /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7918C806E00070BB5F /* main.cpp */; };
 		9C7A3B3E18C806E00070BB5F /* nacl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7B18C806E00070BB5F /* nacl.cpp */; };
 		9C7A3B3F18C806E00070BB5F /* nullDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7C18C806E00070BB5F /* nullDC.cpp */; };
 		9C7A3B4018C806E00070BB5F /* alsa_audiostream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A7E18C806E00070BB5F /* alsa_audiostream.cpp */; };
@@ -192,10 +186,6 @@
 		9C7A3B4C18C806E00070BB5F /* TexCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9518C806E00070BB5F /* TexCache.cpp */; };
 		9C7A3B4D18C806E00070BB5F /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9818C806E00070BB5F /* main.cpp */; };
 		9C7A3B4E18C806E00070BB5F /* stdclass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9918C806E00070BB5F /* stdclass.cpp */; };
-		9C7A3B4F18C806E00070BB5F /* win86_driver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9D18C806E00070BB5F /* win86_driver.cpp */; };
-		9C7A3B5018C806E00070BB5F /* win86_il.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9E18C806E00070BB5F /* win86_il.cpp */; };
-		9C7A3B5118C806E00070BB5F /* win86_ngen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3A9F18C806E00070BB5F /* win86_ngen.cpp */; };
-		9C7A3B5218C806E00070BB5F /* winmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3AA118C806E00070BB5F /* winmain.cpp */; };
 		9C7A3B5918C81A4F0070BB5F /* SWRevealViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3B5818C81A4F0070BB5F /* SWRevealViewController.m */; };
 		9C7A3B5C18C81BC80070BB5F /* SideDrawerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3B5B18C81BC80070BB5F /* SideDrawerViewController.m */; };
 		9C7A3B5F18C81D090070BB5F /* BrowserTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C7A3B5E18C81D090070BB5F /* BrowserTableViewController.m */; };
@@ -404,19 +394,6 @@
 		9C7A39CD18C806DF0070BB5F /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zlib.h; sourceTree = "<group>"; };
 		9C7A39CE18C806DF0070BB5F /* zutil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zutil.c; sourceTree = "<group>"; };
 		9C7A39CF18C806DF0070BB5F /* zutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zutil.h; sourceTree = "<group>"; };
-		9C7A39D118C806DF0070BB5F /* emitter.vcxproj */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = emitter.vcxproj; sourceTree = "<group>"; };
-		9C7A39D218C806DF0070BB5F /* emitter.vcxproj.user */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = emitter.vcxproj.user; sourceTree = "<group>"; };
-		9C7A39D318C806DF0070BB5F /* generated_class_names.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_class_names.h; sourceTree = "<group>"; };
-		9C7A39D418C806DF0070BB5F /* generated_class_names_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_class_names_string.h; sourceTree = "<group>"; };
-		9C7A39D518C806DF0070BB5F /* generated_descriptors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_descriptors.h; sourceTree = "<group>"; };
-		9C7A39D618C806DF0070BB5F /* generated_indexes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = generated_indexes.h; sourceTree = "<group>"; };
-		9C7A39D718C806DF0070BB5F /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
-		9C7A39D818C806DF0070BB5F /* x86_emitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = x86_emitter.cpp; sourceTree = "<group>"; };
-		9C7A39D918C806DF0070BB5F /* x86_emitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_emitter.h; sourceTree = "<group>"; };
-		9C7A39DA18C806DF0070BB5F /* x86_matcher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_matcher.h; sourceTree = "<group>"; };
-		9C7A39DB18C806DF0070BB5F /* x86_op_classes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_op_classes.h; sourceTree = "<group>"; };
-		9C7A39DC18C806DF0070BB5F /* x86_op_encoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_op_encoder.h; sourceTree = "<group>"; };
-		9C7A39DD18C806DF0070BB5F /* x86_op_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x86_op_table.h; sourceTree = "<group>"; };
 		9C7A39E018C806DF0070BB5F /* aica.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aica.cpp; sourceTree = "<group>"; };
 		9C7A39E118C806DF0070BB5F /* aica.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aica.h; sourceTree = "<group>"; };
 		9C7A39E218C806DF0070BB5F /* aica_if.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aica_if.cpp; sourceTree = "<group>"; };
@@ -548,10 +525,6 @@
 		9C7A3A7018C806E00070BB5F /* gl3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl3.h; sourceTree = "<group>"; };
 		9C7A3A7118C806E00070BB5F /* gl3platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl3platform.h; sourceTree = "<group>"; };
 		9C7A3A7318C806E00070BB5F /* khrplatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = khrplatform.h; sourceTree = "<group>"; };
-		9C7A3A7518C806E00070BB5F /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; };
-		9C7A3A7618C806E00070BB5F /* nixprof.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nixprof.cpp; sourceTree = "<group>"; };
-		9C7A3A7718C806E00070BB5F /* typedefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = typedefs.h; sourceTree = "<group>"; };
-		9C7A3A7918C806E00070BB5F /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
 		9C7A3A7B18C806E00070BB5F /* nacl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nacl.cpp; sourceTree = "<group>"; };
 		9C7A3A7C18C806E00070BB5F /* nullDC.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nullDC.cpp; sourceTree = "<group>"; };
 		9C7A3A7E18C806E00070BB5F /* alsa_audiostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = alsa_audiostream.cpp; sourceTree = "<group>"; };
@@ -563,7 +536,7 @@
 		9C7A3A8518C806E00070BB5F /* profiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = profiler.h; sourceTree = "<group>"; };
 		9C7A3A8618C806E00070BB5F /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = "<group>"; };
 		9C7A3A8818C806E00070BB5F /* arm_dyna.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = arm_dyna.cpp; sourceTree = "<group>"; };
-		9C7A3A8918C806E00070BB5F /* ngen_arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = ngen_arm.S; sourceTree = "<group>"; };
+		9C7A3A8918C806E00070BB5F /* ngen_arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = ngen_arm.S; sourceTree = "<group>"; usesTabs = 1; };
 		9C7A3A8C18C806E00070BB5F /* d3d11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = d3d11.cpp; sourceTree = "<group>"; };
 		9C7A3A8E18C806E00070BB5F /* gldraw.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gldraw.cpp; sourceTree = "<group>"; };
 		9C7A3A8F18C806E00070BB5F /* gles.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gles.cpp; sourceTree = "<group>"; };
@@ -577,11 +550,6 @@
 		9C7A3A9918C806E00070BB5F /* stdclass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdclass.cpp; sourceTree = "<group>"; };
 		9C7A3A9A18C806E00070BB5F /* stdclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdclass.h; sourceTree = "<group>"; };
 		9C7A3A9B18C806E00070BB5F /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = "<group>"; };
-		9C7A3A9D18C806E00070BB5F /* win86_driver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win86_driver.cpp; sourceTree = "<group>"; };
-		9C7A3A9E18C806E00070BB5F /* win86_il.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win86_il.cpp; sourceTree = "<group>"; };
-		9C7A3A9F18C806E00070BB5F /* win86_ngen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = win86_ngen.cpp; sourceTree = "<group>"; };
-		9C7A3AA018C806E00070BB5F /* win86_ngen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = win86_ngen.h; sourceTree = "<group>"; };
-		9C7A3AA118C806E00070BB5F /* winmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winmain.cpp; sourceTree = "<group>"; };
 		9C7A3B5718C81A4F0070BB5F /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWRevealViewController.h; sourceTree = "<group>"; };
 		9C7A3B5818C81A4F0070BB5F /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWRevealViewController.m; sourceTree = "<group>"; };
 		9C7A3B5A18C81BC80070BB5F /* SideDrawerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SideDrawerViewController.h; path = emulator/SideDrawerViewController.h; sourceTree = "<group>"; };
@@ -798,12 +766,9 @@
 				9C7A395018C806DE0070BB5F /* cfg */,
 				9C7A395418C806DE0070BB5F /* core.mk */,
 				9C7A395518C806DE0070BB5F /* deps */,
-				9C7A39D018C806DF0070BB5F /* emitter */,
 				9C7A39DE18C806DF0070BB5F /* hw */,
 				9C7A3A5A18C806E00070BB5F /* imgread */,
 				9C7A3A6518C806E00070BB5F /* khronos */,
-				9C7A3A7418C806E00070BB5F /* linux */,
-				9C7A3A7818C806E00070BB5F /* linux-dist */,
 				9C7A3A7A18C806E00070BB5F /* nacl */,
 				9C7A3A7C18C806E00070BB5F /* nullDC.cpp */,
 				9C7A3A7D18C806E00070BB5F /* oslib */,
@@ -815,7 +780,6 @@
 				9C7A3A9918C806E00070BB5F /* stdclass.cpp */,
 				9C7A3A9A18C806E00070BB5F /* stdclass.h */,
 				9C7A3A9B18C806E00070BB5F /* types.h */,
-				9C7A3A9C18C806E00070BB5F /* windows */,
 			);
 			name = "Emulator Core Code";
 			path = ../../../core;
@@ -1037,26 +1001,6 @@
 			path = zlib;
 			sourceTree = "<group>";
 		};
-		9C7A39D018C806DF0070BB5F /* emitter */ = {
-			isa = PBXGroup;
-			children = (
-				9C7A39D118C806DF0070BB5F /* emitter.vcxproj */,
-				9C7A39D218C806DF0070BB5F /* emitter.vcxproj.user */,
-				9C7A39D318C806DF0070BB5F /* generated_class_names.h */,
-				9C7A39D418C806DF0070BB5F /* generated_class_names_string.h */,
-				9C7A39D518C806DF0070BB5F /* generated_descriptors.h */,
-				9C7A39D618C806DF0070BB5F /* generated_indexes.h */,
-				9C7A39D718C806DF0070BB5F /* types.h */,
-				9C7A39D818C806DF0070BB5F /* x86_emitter.cpp */,
-				9C7A39D918C806DF0070BB5F /* x86_emitter.h */,
-				9C7A39DA18C806DF0070BB5F /* x86_matcher.h */,
-				9C7A39DB18C806DF0070BB5F /* x86_op_classes.h */,
-				9C7A39DC18C806DF0070BB5F /* x86_op_encoder.h */,
-				9C7A39DD18C806DF0070BB5F /* x86_op_table.h */,
-			);
-			path = emitter;
-			sourceTree = "<group>";
-		};
 		9C7A39DE18C806DF0070BB5F /* hw */ = {
 			isa = PBXGroup;
 			children = (
@@ -1337,24 +1281,6 @@
 			path = KHR;
 			sourceTree = "<group>";
 		};
-		9C7A3A7418C806E00070BB5F /* linux */ = {
-			isa = PBXGroup;
-			children = (
-				9C7A3A7518C806E00070BB5F /* common.cpp */,
-				9C7A3A7618C806E00070BB5F /* nixprof.cpp */,
-				9C7A3A7718C806E00070BB5F /* typedefs.h */,
-			);
-			path = linux;
-			sourceTree = "<group>";
-		};
-		9C7A3A7818C806E00070BB5F /* linux-dist */ = {
-			isa = PBXGroup;
-			children = (
-				9C7A3A7918C806E00070BB5F /* main.cpp */,
-			);
-			path = "linux-dist";
-			sourceTree = "<group>";
-		};
 		9C7A3A7A18C806E00070BB5F /* nacl */ = {
 			isa = PBXGroup;
 			children = (
@@ -1441,18 +1367,6 @@
 			path = sdl;
 			sourceTree = "<group>";
 		};
-		9C7A3A9C18C806E00070BB5F /* windows */ = {
-			isa = PBXGroup;
-			children = (
-				9C7A3A9D18C806E00070BB5F /* win86_driver.cpp */,
-				9C7A3A9E18C806E00070BB5F /* win86_il.cpp */,
-				9C7A3A9F18C806E00070BB5F /* win86_ngen.cpp */,
-				9C7A3AA018C806E00070BB5F /* win86_ngen.h */,
-				9C7A3AA118C806E00070BB5F /* winmain.cpp */,
-			);
-			path = windows;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -1513,7 +1427,6 @@
 				9C7A3C1018C851C50070BB5F /* HideEmulator@2x.png in Resources */,
 				9C7A3C0018C851C50070BB5F /* 210-octocat@2x.png in Resources */,
 				9C7A3C0518C851C50070BB5F /* close.png in Resources */,
-				9C7A3AFE18C806E00070BB5F /* emitter.vcxproj.user in Resources */,
 				9C7A3C1718C851C50070BB5F /* LTrigger.png in Resources */,
 				9C7A3C0218C851C50070BB5F /* 210-twitterbird@2x.png in Resources */,
 				9C7A3C0918C851C50070BB5F /* disc.png in Resources */,
@@ -1522,7 +1435,6 @@
 				9C7A3C0F18C851C50070BB5F /* HideEmulator.png in Resources */,
 				9C7A3C0E18C851C50070BB5F /* DPad@2x.png in Resources */,
 				87078AA318A47FE90034C7A0 /* Shader.fsh in Resources */,
-				9C7A3AFD18C806E00070BB5F /* emitter.vcxproj in Resources */,
 				9C7A3C1E18C851C50070BB5F /* row@2x.png in Resources */,
 				9C7A3C2118C851C50070BB5F /* RTrigger.png in Resources */,
 				9C7A3C0B18C851C50070BB5F /* disclosure.png in Resources */,
@@ -1582,10 +1494,8 @@
 				9C7A3AF918C806E00070BB5F /* Makefile in Sources */,
 				9C7A3B0D18C806E00070BB5F /* sb_dma.cpp in Sources */,
 				9C7A3ADC18C806E00070BB5F /* zip_open.c in Sources */,
-				9C7A3B5118C806E00070BB5F /* win86_ngen.cpp in Sources */,
 				9C7A3AF218C806E00070BB5F /* compress.c in Sources */,
 				9C7A3B2718C806E00070BB5F /* dmac.cpp in Sources */,
-				9C7A3AFF18C806E00070BB5F /* x86_emitter.cpp in Sources */,
 				9C7A3B3118C806E00070BB5F /* sh4_mmr.cpp in Sources */,
 				9C7A3AFC18C806E00070BB5F /* zutil.c in Sources */,
 				9C7A3AAA18C806E00070BB5F /* elf32.cpp in Sources */,
@@ -1607,11 +1517,9 @@
 				9C7A3B0018C806E00070BB5F /* aica.cpp in Sources */,
 				9C7A3B3318C806E00070BB5F /* sh4_rom.cpp in Sources */,
 				9C7A3B1918C806E00070BB5F /* spg.cpp in Sources */,
-				9C7A3B5018C806E00070BB5F /* win86_il.cpp in Sources */,
 				9C7A3AB518C806E00070BB5F /* pngset.c in Sources */,
 				9C7A3AE318C806E00070BB5F /* zip_source_buffer.c in Sources */,
 				9C7A3B2318C806E00070BB5F /* sh4_opcodes.cpp in Sources */,
-				9C7A3B4F18C806E00070BB5F /* win86_driver.cpp in Sources */,
 				9C7A3ADA18C806E00070BB5F /* zip_name_locate.c in Sources */,
 				9C7A3B1B18C806E00070BB5F /* ta_ctx.cpp in Sources */,
 				9C7A3AE018C806E00070BB5F /* zip_set_archive_flag.c in Sources */,
@@ -1650,7 +1558,6 @@
 				9C7A3B5F18C81D090070BB5F /* BrowserTableViewController.m in Sources */,
 				9C7A3AE118C806E00070BB5F /* zip_set_file_comment.c in Sources */,
 				9C7A3B4118C806E00070BB5F /* audiostream.cpp in Sources */,
-				9C7A3B3D18C806E00070BB5F /* main.cpp in Sources */,
 				9C7A3AB118C806E00070BB5F /* pngread.c in Sources */,
 				9C7A3AAC18C806E00070BB5F /* png.c in Sources */,
 				9C7A3AC718C806E00070BB5F /* zip_error_get_sys_type.c in Sources */,
@@ -1660,7 +1567,6 @@
 				9C7A3AA918C806E00070BB5F /* elf.cpp in Sources */,
 				9C7A3AA618C806E00070BB5F /* chdr.cpp in Sources */,
 				9C7A3AA518C806E00070BB5F /* cdipsr.cpp in Sources */,
-				9C7A3B5218C806E00070BB5F /* winmain.cpp in Sources */,
 				9C7A3AFB18C806E00070BB5F /* uncompr.c in Sources */,
 				9C7A3B1218C806E00070BB5F /* maple_if.cpp in Sources */,
 				9C7A3AC818C806E00070BB5F /* zip_error_strerror.c in Sources */,
@@ -1686,7 +1592,6 @@
 				9C7A3B2918C806E00070BB5F /* mmu.cpp in Sources */,
 				9C7A3B6B18C8209E0070BB5F /* PathsViewController.m in Sources */,
 				9C7A3AEB18C806E00070BB5F /* zip_stat_init.c in Sources */,
-				9C7A3B3B18C806E00070BB5F /* common.cpp in Sources */,
 				9C7A3B6818C8208D0070BB5F /* SettingsViewController.m in Sources */,
 				9C7A3B2E18C806E00070BB5F /* sh4_core_regs.cpp in Sources */,
 				9C7A3B1D18C806E00070BB5F /* blockmanager.cpp in Sources */,
@@ -1708,7 +1613,6 @@
 				9C7A3AB818C806E00070BB5F /* pngwrite.c in Sources */,
 				9C7A3B1518C806E00070BB5F /* pvr_mem.cpp in Sources */,
 				9C7A3B6218C820630070BB5F /* AboutViewController.m in Sources */,
-				9C7A3B3C18C806E00070BB5F /* nixprof.cpp in Sources */,
 				9C7A3AF718C806E00070BB5F /* inflate.c in Sources */,
 				9C7A3AC918C806E00070BB5F /* zip_error_to_str.c in Sources */,
 				9C7A3B0918C806E00070BB5F /* gdrom_response.cpp in Sources */,
@@ -1792,6 +1696,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
+					"TARGET_IPHONE=1",
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -1829,6 +1734,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PREPROCESSOR_DEFINITIONS = "TARGET_IPHONE=1";
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -1845,16 +1751,27 @@
 		87078AC118A47FE90034C7A0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = (
+					armv7s,
+					armv7,
+				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = emulator/reicast.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "emulator/emulator-Prefix.pch";
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					../../core/,
+					../../core/deps/,
+					../../core/khronos/,
+				);
 				INFOPLIST_FILE = "emulator/emulator-Info.plist";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = "armv7 armv7s";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -1862,16 +1779,27 @@
 		87078AC218A47FE90034C7A0 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = (
+					armv7s,
+					armv7,
+				);
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = emulator/reicast.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "emulator/emulator-Prefix.pch";
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					../../core/,
+					../../core/deps/,
+					../../core/khronos/,
+				);
 				INFOPLIST_FILE = "emulator/emulator-Info.plist";
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				VALID_ARCHS = "armv7 armv7s";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
diff --git a/shell/ios/emulator/MainStoryboard.storyboard b/shell/ios/emulator/MainStoryboard.storyboard
index 51dbd9a63..13243cb81 100644
--- a/shell/ios/emulator/MainStoryboard.storyboard
+++ b/shell/ios/emulator/MainStoryboard.storyboard
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="QCW-Gp-iOd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13C1021" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="QCW-Gp-iOd">
     <dependencies>
         <deployment defaultVersion="1280" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
     <scenes>
         <!--Settings View Controller - Settings-->
@@ -379,26 +379,8 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="phq-AM-6qj" style="IBUITableViewCellStyleDefault" id="lJ0-d7-vTF">
-                                <rect key="frame" x="0.0" y="86" width="320" height="44"/>
-                                <autoresizingMask key="autoresizingMask"/>
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lJ0-d7-vTF" id="2xI-kI-Nm5">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
-                                    <autoresizingMask key="autoresizingMask"/>
-                                    <subviews>
-                                        <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Boot Dreamcast BIOS" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="phq-AM-6qj">
-                                            <rect key="frame" x="15" y="0.0" width="290" height="43"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="18"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
-                                            <nil key="highlightedColor"/>
-                                        </label>
-                                    </subviews>
-                                </tableViewCellContentView>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                            </tableViewCell>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Cell" textLabel="lOv-kD-h2B" detailTextLabel="HlI-3W-pld" style="IBUITableViewCellStyleSubtitle" id="pD9-A1-vrD">
-                                <rect key="frame" x="0.0" y="130" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="86" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="pD9-A1-vrD" id="aZI-sF-Tpa">
                                     <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
@@ -848,224 +830,10 @@
         <!--Side Drawer View Controller-->
         <scene sceneID="4Yv-XG-ZpS">
             <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="wHS-Li-Mt9" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <tableViewController storyboardIdentifier="Static" id="G5S-J0-8NS" customClass="SideDrawerViewController" sceneMemberID="viewController">
-                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="W6x-vl-Yes">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="0.1960784314" green="0.1960784314" blue="0.1960784314" alpha="1" colorSpace="calibratedRGB"/>
-                        <imageView key="tableHeaderView" userInteractionEnabled="NO" contentMode="scaleAspectFill" id="IdG-P9-58o">
-                            <rect key="frame" x="0.0" y="0.0" width="320" height="23"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        </imageView>
-                        <sections>
-                            <tableViewSection id="5bO-pn-k6g">
-                                <cells>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="browser" id="yWH-uO-gSN" customClass="MenuCell">
-                                        <rect key="frame" x="0.0" y="23" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yWH-uO-gSN" id="18s-3V-rCO">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="rowselected.png" id="PWz-Et-Vn3">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="row.png" id="F7H-gT-qIL">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Browser" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="GCc-cx-jVv">
-                                                    <rect key="frame" x="43" y="11" width="211" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="disclosure.png" id="FeY-tJ-AmE">
-                                                    <rect key="frame" x="250" y="12" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="disc.png" id="Wb4-Uc-IKI">
-                                                    <rect key="frame" x="9" y="9" width="26" height="26"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="backgroundView" destination="F7H-gT-qIL" id="Saz-i0-qyk"/>
-                                            <outlet property="disclosureImage" destination="FeY-tJ-AmE" id="a81-nQ-5cr"/>
-                                            <outlet property="selectedBackgroundView" destination="PWz-Et-Vn3" id="QRK-55-6o1"/>
-                                            <segue destination="12" kind="custom" customClass="SWRevealViewControllerSegue" trigger="accessoryAction" id="LRx-0Z-bBN"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="settings" id="bw2-C6-8qN" customClass="MenuCell">
-                                        <rect key="frame" x="0.0" y="67" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bw2-C6-8qN" id="1G7-yi-EZx">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="rowselected.png" id="rFJ-BG-Sjc">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="row.png" id="JcI-m1-q7d">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="disclosure.png" id="IDS-8H-6do">
-                                                    <rect key="frame" x="250" y="10" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Settings" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="zr6-zi-kgl">
-                                                    <rect key="frame" x="43" y="11" width="211" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
-                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="config.png" id="hu6-sd-ivn">
-                                                    <rect key="frame" x="9" y="9" width="26" height="26"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="backgroundView" destination="JcI-m1-q7d" id="jlb-wv-4gL"/>
-                                            <outlet property="disclosureImage" destination="IDS-8H-6do" id="kkw-8z-Zat"/>
-                                            <outlet property="selectedBackgroundView" destination="rFJ-BG-Sjc" id="dqA-YX-h1a"/>
-                                            <segue destination="c3c-6p-wCh" kind="custom" customClass="SWRevealViewControllerSegue" trigger="accessoryAction" id="uWt-k7-bY5"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="paths" id="1YN-co-peb" customClass="MenuCell">
-                                        <rect key="frame" x="0.0" y="111" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1YN-co-peb" id="vcY-Cl-EzH">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="rowselected.png" id="Bd0-LL-bi5">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="row.png" id="uZK-kk-9iZ">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="disclosure.png" id="rir-YF-KRn">
-                                                    <rect key="frame" x="250" y="10" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Paths" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="7rs-Ee-hYD">
-                                                    <rect key="frame" x="43" y="11" width="211" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
-                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="config.png" id="kfG-fx-Ryb">
-                                                    <rect key="frame" x="9" y="9" width="26" height="26"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="backgroundView" destination="uZK-kk-9iZ" id="q66-Kf-6Rk"/>
-                                            <outlet property="disclosureImage" destination="rir-YF-KRn" id="nXv-GM-h20"/>
-                                            <outlet property="selectedBackgroundView" destination="Bd0-LL-bi5" id="5wT-vU-JKC"/>
-                                            <segue destination="XzS-kx-tLR" kind="custom" customClass="SWRevealViewControllerSegue" trigger="accessoryAction" id="ZfG-Ck-y1N"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="input" id="roF-Xv-zlv" customClass="MenuCell">
-                                        <rect key="frame" x="0.0" y="155" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="roF-Xv-zlv" id="ysB-mi-7qA">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="rowselected.png" id="3Bc-S6-gtS">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="row.png" id="xZw-e3-Q1E">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="disclosure.png" id="UhB-dO-sq9">
-                                                    <rect key="frame" x="250" y="10" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Input" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="xci-pP-tmX">
-                                                    <rect key="frame" x="43" y="11" width="211" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
-                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="input.png" id="30b-Fg-E5g">
-                                                    <rect key="frame" x="9" y="9" width="26" height="26"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="backgroundView" destination="xZw-e3-Q1E" id="bdR-O0-Gqb"/>
-                                            <outlet property="disclosureImage" destination="UhB-dO-sq9" id="hDH-qP-U6k"/>
-                                            <outlet property="selectedBackgroundView" destination="3Bc-S6-gtS" id="d1S-N4-lEA"/>
-                                            <segue destination="PZu-Bi-7Xn" kind="custom" customClass="SWRevealViewControllerSegue" trigger="accessoryAction" id="TOC-px-3X2"/>
-                                        </connections>
-                                    </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="gray" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="about" id="8fc-MH-AFQ" customClass="MenuCell">
-                                        <rect key="frame" x="0.0" y="199" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="8fc-MH-AFQ" id="baB-lb-KIZ">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="rowselected.png" id="Fln-7V-ElH">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="row.png" id="Z8e-9R-sRd">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="disclosure.png" id="RIZ-EX-avI">
-                                                    <rect key="frame" x="250" y="10" width="20" height="20"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="About" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="jfi-JX-LAK">
-                                                    <rect key="frame" x="43" y="11" width="211" height="22"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                </label>
-                                                <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" image="config.png" id="anF-t0-FI6">
-                                                    <rect key="frame" x="9" y="9" width="26" height="26"/>
-                                                    <autoresizingMask key="autoresizingMask"/>
-                                                </imageView>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                        <connections>
-                                            <outlet property="backgroundView" destination="Z8e-9R-sRd" id="BaU-Io-AiR"/>
-                                            <outlet property="disclosureImage" destination="RIZ-EX-avI" id="ITB-45-YMy"/>
-                                            <outlet property="selectedBackgroundView" destination="Fln-7V-ElH" id="tyY-6v-QnO"/>
-                                            <segue destination="kY3-6f-RlH" kind="custom" customClass="SWRevealViewControllerSegue" trigger="accessoryAction" id="USH-YV-e0X"/>
-                                        </connections>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
-                        </sections>
-                        <connections>
-                            <outlet property="dataSource" destination="G5S-J0-8NS" id="mbW-LV-Ftt"/>
-                            <outlet property="delegate" destination="G5S-J0-8NS" id="maD-Mf-ueC"/>
-                        </connections>
-                    </tableView>
                     <simulatedStatusBarMetrics key="simulatedStatusBarMetrics" statusBarStyle="blackOpaque"/>
                 </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="wHS-Li-Mt9" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-41" y="356"/>
         </scene>
@@ -1363,6 +1131,7 @@
         <!--Navigation Controller-->
         <scene sceneID="6mx-8l-fBn">
             <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="mYK-ES-4ep" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <navigationController definesPresentationContext="YES" id="2a6-jc-CVw" sceneMemberID="viewController">
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="GEg-bW-l1t">
@@ -1377,7 +1146,6 @@
                         <segue destination="12" kind="relationship" relationship="rootViewController" id="bPa-BK-u0Y"/>
                     </connections>
                 </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="mYK-ES-4ep" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-41" y="-984"/>
         </scene>
@@ -1389,13 +1157,7 @@
         <image name="RTrigger.png" width="67" height="44"/>
         <image name="Start.png" width="48" height="26"/>
         <image name="close.png" width="26" height="26"/>
-        <image name="config.png" width="26" height="26"/>
-        <image name="disc.png" width="26" height="26"/>
-        <image name="disclosure.png" width="20" height="20"/>
-        <image name="input.png" width="26" height="26"/>
         <image name="menuicon.png" width="20" height="17"/>
-        <image name="row.png" width="1" height="44"/>
-        <image name="rowselected.png" width="1" height="44"/>
     </resources>
     <color key="tintColor" red="0.2470588386" green="0.50196081400000003" blue="0.84705889229999998" alpha="1" colorSpace="deviceRGB"/>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
@@ -1403,7 +1165,4 @@
         <simulatedOrientationMetrics key="orientation"/>
         <simulatedScreenMetrics key="destination" type="retina4"/>
     </simulatedMetricsContainer>
-    <inferredMetricsTieBreakers>
-        <segue reference="LRx-0Z-bBN"/>
-    </inferredMetricsTieBreakers>
-</document>
\ No newline at end of file
+</document>