diff --git a/Export/android/app/src/main/AndroidManifest.xml b/Export/android/app/src/main/AndroidManifest.xml
index 2b857566..042dd46b 100644
--- a/Export/android/app/src/main/AndroidManifest.xml
+++ b/Export/android/app/src/main/AndroidManifest.xml
@@ -2,10 +2,10 @@
 <!-- Replace com.example.heapsandroid.helloword with the identifier of your game below, e.g.
      com.gamemaker.game -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.randomityguy.mbhaxe.mbp"
+    package="com.randomityguy.mbhaxe.mbg"
     android:installLocation="auto"
-    android:versionCode="6"
-    android:versionName="1.7.2">
+    android:versionCode="2"
+    android:versionName="1.1.13">
 
     <!-- Tell the system this app requires OpenGL ES 3.0. -->
     <uses-feature android:glEsVersion="0x00030000" android:required="true" />
diff --git a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index c0beb2f9..a8a35a23 100644
Binary files a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png
index 6f4753d2..6f7b0c1e 100644
Binary files a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 88a262d4..c1dde9f0 100644
Binary files a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
index 88a262d4..1fd970a6 100644
Binary files a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ
diff --git a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index b648dcfc..8005923d 100644
Binary files a/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/Export/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 400200f0..4c1b3314 100644
Binary files a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png
index ca824730..ebef84cd 100644
Binary files a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index b44f38eb..31d559a9 100644
Binary files a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
index b44f38eb..9586b46b 100644
Binary files a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ
diff --git a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 7e1a924f..c5b8aa6e 100644
Binary files a/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/Export/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 42a2648b..d7c0c115 100644
Binary files a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
index 36a0675b..198c7db7 100644
Binary files a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index d8bdc4b8..4dc1c964 100644
Binary files a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
index d8bdc4b8..5f822e3f 100644
Binary files a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 6794af5f..67b6aff0 100644
Binary files a/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/Export/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 19600a90..762e1317 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
index 9dc903ef..c788230b 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 9f7cfb64..7fe4fabb 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
index 9f7cfb64..3b8d4244 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index fbcc7351..06462f8a 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/Export/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c8ae2474..7ba9be3c 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
index 7f5b4265..7a546b10 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 852b6b4e..e23af5bd 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
index 852b6b4e..8efd31a1 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 146db4f0..f6e19e2a 100644
Binary files a/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/Export/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/Export/android/app/src/main/res/values/strings.xml b/Export/android/app/src/main/res/values/strings.xml
index 4fe75e59..8196b626 100644
--- a/Export/android/app/src/main/res/values/strings.xml
+++ b/Export/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Marble Blast Platinum</string>
+    <string name="app_name">Marble Blast Gold</string>
 </resources>
\ No newline at end of file
diff --git a/src/gui/OptionsDlg.hx b/src/gui/OptionsDlg.hx
index d376999a..575eecf1 100644
--- a/src/gui/OptionsDlg.hx
+++ b/src/gui/OptionsDlg.hx
@@ -16,6 +16,7 @@ import src.Settings;
 
 class OptionsDlg extends GuiImage {
 	var musicSliderFunc:(dt:Float, mouseState:MouseState) -> Void;
+	var importing = false;
 
 	public function new() {
 		var img = ResourceLoader.getImage("data/ui/background.jpg");
@@ -42,22 +43,37 @@ class OptionsDlg extends GuiImage {
 			return [normal, hover, pressed];
 		}
 
-		var window = new GuiImage(ResourceLoader.getResource("data/ui/options/window.png", ResourceLoader.getImage, this.imageResources).toTile());
-		window.horizSizing = Center;
-		window.vertSizing = Center;
-		window.position = new Vector(-72, -47);
-		window.extent = new Vector(784, 573);
-		this.addChild(window);
+		var tabs = new GuiControl();
+		tabs.horizSizing = Center;
+		tabs.vertSizing = Center;
+		tabs.position = new Vector(60, 15);
+		tabs.extent = new Vector(520, 450);
+		this.addChild(tabs);
 
-		var generalBtn = new GuiButton(loadButtonImages('data/ui/options/general'));
-		generalBtn.position = new Vector(102, 19);
-		generalBtn.extent = new Vector(134, 65);
-		window.addChild(generalBtn);
+		var setTab:String->Void = null;
+
+		var graphicsTab = new GuiImage(ResourceLoader.getResource("data/ui/options/graf_tab.png", ResourceLoader.getImage, this.imageResources).toTile());
+		graphicsTab.position = new Vector(58, 44);
+		graphicsTab.extent = new Vector(149, 86);
+
+		var controlsTab = new GuiImage(ResourceLoader.getResource("data/ui/options/cntr_tab.png", ResourceLoader.getImage, this.imageResources).toTile());
+		controlsTab.position = new Vector(315, 15);
+		controlsTab.extent = new Vector(149, 65);
+
+		var rewindTab = new GuiImage(ResourceLoader.getResource("data/ui/options/rwnd_tab.png", ResourceLoader.getImage, this.imageResources).toTile());
+		rewindTab.position = new Vector(459, 76);
+		rewindTab.extent = new Vector(59, 162);
 
 		var audioTab = new GuiImage(ResourceLoader.getResource("data/ui/options/aud_tab.png", ResourceLoader.getImage, this.imageResources).toTile());
 		audioTab.position = new Vector(204, 33);
 		audioTab.extent = new Vector(114, 75);
 
+		var boxFrame = new GuiImage(ResourceLoader.getResource("data/ui/options/options_base.png", ResourceLoader.getImage, this.imageResources).toTile());
+		boxFrame.position = new Vector(25, 14);
+		boxFrame.extent = new Vector(470, 422);
+		boxFrame.horizSizing = Center;
+		boxFrame.vertSizing = Center;
+
 		tabs.addChild(audioTab);
 		tabs.addChild(controlsTab);
 		tabs.addChild(rewindTab);