diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba91689..981aca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ else()
 	if (MSVC)
 		add_compile_options(/O2 /fp:fast /GA /GL /Gw Qpar /RTCu)
 	else()
-		add_compile_options(-0fast -ffast-math -fdevirtualize-speculatively -fspeculatively-call-stored-functions -fipa-pta -fdelete-null-pointer-checks -flimit-function-alignment)
+		add_compile_options(-s -0fast -ffast-math -fdevirtualize-speculatively -fspeculatively-call-stored-functions -fipa-pta -fdelete-null-pointer-checks -flimit-function-alignment -faggressive-loop-optimizations)
 	endif()
 endif()
 ## Setup main source ##
diff --git a/oneshot.conf b/oneshot.conf
index 2e6ea01..f65ea6f 100644
--- a/oneshot.conf
+++ b/oneshot.conf
@@ -24,6 +24,7 @@
 
 # 16:9 support
 # EXPEREMENTAL!
+#
 # EnableSixteenByNine=false
 
 # Apply linear interpolation when game screen
diff --git a/patches/assets/Data/CommonEvents.rxdata b/patches/assets/Data/CommonEvents.rxdata
deleted file mode 100644
index b3529bf..0000000
Binary files a/patches/assets/Data/CommonEvents.rxdata and /dev/null differ
diff --git a/patches/assets/Data/Map004.rxdata b/patches/assets/Data/Map004.rxdata
deleted file mode 100644
index 08fb5e2..0000000
Binary files a/patches/assets/Data/Map004.rxdata and /dev/null differ
diff --git a/patches/assets/Data/Map005.rxdata b/patches/assets/Data/Map005.rxdata
deleted file mode 100644
index 8d64eae..0000000
Binary files a/patches/assets/Data/Map005.rxdata and /dev/null differ
diff --git a/patches/assets/Data/Map061.rxdata b/patches/assets/Data/Map061.rxdata
deleted file mode 100644
index 4d0eaa1..0000000
Binary files a/patches/assets/Data/Map061.rxdata and /dev/null differ
diff --git a/patches/assets/Data/Map243.rxdata b/patches/assets/Data/Map243.rxdata
deleted file mode 100644
index 5e724e0..0000000
Binary files a/patches/assets/Data/Map243.rxdata and /dev/null differ
diff --git a/patches/assets/Data/Map255.rxdata b/patches/assets/Data/Map255.rxdata
deleted file mode 100644
index b99a72b..0000000
Binary files a/patches/assets/Data/Map255.rxdata and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/es/pj_portal.png b/patches/assets/Graphics/Pictures/es/pj_portal.png
deleted file mode 100644
index 886a8ea..0000000
Binary files a/patches/assets/Graphics/Pictures/es/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/fr/pj_portal.png b/patches/assets/Graphics/Pictures/fr/pj_portal.png
deleted file mode 100644
index 157edda..0000000
Binary files a/patches/assets/Graphics/Pictures/fr/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/jp/pj_portal.png b/patches/assets/Graphics/Pictures/jp/pj_portal.png
deleted file mode 100644
index 177a435..0000000
Binary files a/patches/assets/Graphics/Pictures/jp/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/ko/pj_portal.png b/patches/assets/Graphics/Pictures/ko/pj_portal.png
deleted file mode 100644
index c0adf80..0000000
Binary files a/patches/assets/Graphics/Pictures/ko/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/pj_portal.png b/patches/assets/Graphics/Pictures/pj_portal.png
deleted file mode 100644
index 245b767..0000000
Binary files a/patches/assets/Graphics/Pictures/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/pt_BR/pj_portal.png b/patches/assets/Graphics/Pictures/pt_BR/pj_portal.png
deleted file mode 100644
index 4914c7a..0000000
Binary files a/patches/assets/Graphics/Pictures/pt_BR/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/shrimp.png b/patches/assets/Graphics/Pictures/shrimp.png
deleted file mode 100644
index fbb8c10..0000000
Binary files a/patches/assets/Graphics/Pictures/shrimp.png and /dev/null differ
diff --git a/patches/assets/Graphics/Pictures/zh_CN/pj_portal.png b/patches/assets/Graphics/Pictures/zh_CN/pj_portal.png
deleted file mode 100644
index e06d2df..0000000
Binary files a/patches/assets/Graphics/Pictures/zh_CN/pj_portal.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/desktop.png b/patches/assets/Wallpaper/desktop.png
deleted file mode 100644
index f83e101..0000000
Binary files a/patches/assets/Wallpaper/desktop.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/es/save_unix.png b/patches/assets/Wallpaper/es/save_unix.png
deleted file mode 100644
index 3ee9f87..0000000
Binary files a/patches/assets/Wallpaper/es/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/fr/save_unix.png b/patches/assets/Wallpaper/fr/save_unix.png
deleted file mode 100644
index bb36298..0000000
Binary files a/patches/assets/Wallpaper/fr/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/ja/save_unix.png b/patches/assets/Wallpaper/ja/save_unix.png
deleted file mode 100644
index c2a3323..0000000
Binary files a/patches/assets/Wallpaper/ja/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/ko/save_unix.png b/patches/assets/Wallpaper/ko/save_unix.png
deleted file mode 100644
index 80f4dff..0000000
Binary files a/patches/assets/Wallpaper/ko/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/pt_BR/save_unix.png b/patches/assets/Wallpaper/pt_BR/save_unix.png
deleted file mode 100644
index ac52ed3..0000000
Binary files a/patches/assets/Wallpaper/pt_BR/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/save_unix.png b/patches/assets/Wallpaper/save_unix.png
deleted file mode 100644
index fd3e8ae..0000000
Binary files a/patches/assets/Wallpaper/save_unix.png and /dev/null differ
diff --git a/patches/assets/Wallpaper/zh_CN/save_unix.png b/patches/assets/Wallpaper/zh_CN/save_unix.png
deleted file mode 100644
index b637ba3..0000000
Binary files a/patches/assets/Wallpaper/zh_CN/save_unix.png and /dev/null differ
diff --git a/patches/ruby/static_zlib.patch b/patches/ruby/static_zlib.patch
deleted file mode 100644
index 62b977e..0000000
--- a/patches/ruby/static_zlib.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/common.mk
-+++ b/common.mk
-@@ -111,6 +111,7 @@ COMMONOBJS    = array.$(OBJEXT) \
- 		vm_trace.$(OBJEXT) \
- 		thread.$(OBJEXT) \
- 		cont.$(OBJEXT) \
-+		ext/zlib/zlib.$(OBJEXT) \
- 		$(BUILTIN_ENCOBJS) \
- 		$(BUILTIN_TRANSOBJS) \
- 		$(MISSING)
-diff --git a/ruby-2.1.5.orig/configure b/ruby-2.1.5/configure
-index d0f1f68..45ab642 100755
---- a/configure
-+++ b/configure
-@@ -2878,6 +2878,8 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
- 
- 
- 
-+LIBS="$LIBS -lz"
-+
- { # environment section
- 
- 
---- a/configure.in
-+++ b/configure.in
-@@ -35,6 +35,8 @@ rm() {
- }
- ])])])
- 
-+LIBS="$LIBS -lz"
-+
- { # environment section
- 
- AC_ARG_WITH(baseruby,
---- a/inits.c
-+++ b/inits.c
-@@ -61,5 +61,6 @@ rb_call_inits(void)
-     CALL(Complex);
-     CALL(version);
-     CALL(vm_trace);
-+    CALL(zlib);
- }
- #undef CALL
diff --git a/scripts-test/Main.rb b/scripts-test/Main.rb
deleted file mode 100644
index c1089db..0000000
--- a/scripts-test/Main.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-begin
-  print("Oneshot: sunshine TEST xScripts.rxdata\nRuby version: #{RUBY_VERSION}\nSDL version: #{Sunshine::SDLVersion_major}.#{Sunshine::SDLVersion_minor}.#{Sunshine::SDLVersion_micro}")
-end
diff --git a/scripts-test/_scripts.txt b/scripts-test/_scripts.txt
deleted file mode 100644
index bb71259..0000000
--- a/scripts-test/_scripts.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Overrides
-Main