diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
index afd0efc..bf1c670 100644
--- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
+++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
@@ -302,12 +302,12 @@ public final class R {
         public static final int secondary_text_default_material_light = 0x7f05004d;
         public static final int secondary_text_disabled_material_dark = 0x7f05004e;
         public static final int secondary_text_disabled_material_light = 0x7f05004f;
-        public static final int switch_thumb_disabled_material_dark = 0x7f050050;
-        public static final int switch_thumb_disabled_material_light = 0x7f050051;
-        public static final int switch_thumb_material_dark = 0x7f050052;
-        public static final int switch_thumb_material_light = 0x7f050053;
-        public static final int switch_thumb_normal_material_dark = 0x7f050054;
-        public static final int switch_thumb_normal_material_light = 0x7f050055;
+        public static final int switch_thumb_disabled_material_dark = 0x7f050051;
+        public static final int switch_thumb_disabled_material_light = 0x7f050052;
+        public static final int switch_thumb_material_dark = 0x7f050053;
+        public static final int switch_thumb_material_light = 0x7f050054;
+        public static final int switch_thumb_normal_material_dark = 0x7f050055;
+        public static final int switch_thumb_normal_material_light = 0x7f050056;
     }
     public static final class dimen {
         public static final int abc_action_bar_content_inset_material = 0x7f060000;
diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
index 2a271d1..a862594 100644
--- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
+++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
@@ -350,7 +350,7 @@
             </obstacleData>
          </obstacles>
          <stars class="java.util.ArrayList">
-            <positionData x="2.7666652" y="0.14000021"/>
+            <positionData x="2.7733319" y="0.4"/>
             <positionData x="6.406662" y="-0.4599995"/>
             <positionData x="14.950134" y="0.7333332"/>
          </stars>
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index fe4f7bd..781b08d 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1395,7 +1395,7 @@
         <item>Grasslands</item>
         <item>Icy Mountains</item>
         <item>Testcave</item>
-    </string-array></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/attr.xml" qualifiers=""/><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/colors.xml" qualifiers=""><color name="primary">#17b3f5</color><color name="primary_dark">#1791f5</color><color name="secondary">#ffb637</color><color name="secondary_light">#ffeb37</color><color name="secondary_dark">#ff8e37</color><color name="secondary_little_transparent">#e2ffb637</color><color name="secondary_much_transparent">#57ffb637</color><color name="red">#ff0000</color><color name="black">#000000</color><color name="transparent">#00000000</color><color name="message_buttons">#daf10d</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="background_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/dimen.xml" qualifiers=""><dimen name="credits_margin_between_categories">30dp</dimen><dimen name="tool_inspector_width">170dp</dimen><dimen name="shape_inspector_width">170dp</dimen><dimen name="tool_button_width">70dp</dimen><dimen name="tool_button_height">60dp</dimen></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/strings.xml" qualifiers=""><string name="app_name" translatable="false">Endless Roll</string><string name="placeholder_button">Click me!</string><string name="placeholder_textview">I\'m a text!</string><string name="placeholder_number" translatable="false">997.5</string><string name="settings_show_fps">Show Fps</string><string name="game_bomb_error_message">Set the bomb on an obstacle</string><string name="game_playerprogress_placeholder" translatable="false">0.0m</string><string name="game_playerprogress_format_f" translatable="false">%.1fm</string><string name="game_playerspeed_placeholder" translatable="false">0.0m/s</string><string name="game_playerspeed_format_f" translatable="false">%.1fm/s</string><string name="game_fps_placeholder" translatable="false">Fps: 00</string><string name="game_fps_format_d" translatable="false">Fps: %d</string><string name="game_countdown_placeholder" translatable="false">3</string><string name="levelup" translatable="false">Level Up</string><string name="message_game_over" translatable="false">GAME OVER</string><string name="message_level_finished">LEVEL FINISHED</string><string name="message_to_menu">To menu</string><string name="message_try_again">Try again</string><string name="message_restart">Restart</string><string name="goal_message_restart_format_d">Restart level %d</string><string name="goal_message_next_level_format_d">Next level: %d</string><string name="goal_message_next_world_format_s">Next world:\n%s</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_exit">Exit</string><string name="start_screen_play">Play</string><string name="start_screen_unlock_all_levels" translatable="false">Unlock all levels</string><string name="start_screen_gain_90_ep" translatable="false">Gain 90 ep</string><string name="start_screen_finish_world_1">Finish the first world!</string><string name="start_screen_to_gl_test_screen" translatable="false">Test GL Stuff!!!</string><string name="topbar_level_placeholder" translatable="false">Level: 24</string><string name="topbar_level_format_d" translatable="false">Level: %d</string><string name="settings_reset">Reset progress</string><string name="settings_credits" translatable="false">Credits</string><string name="settings_music">Music</string><string name="settings_sounds" translatable="false">Sounds</string><string name="unlock_message_placeholder">Ramp unlocked</string><string name="world_button_title_placeholder">Great world</string><string name="world_button_progress_placeholder" translatable="false">21/15</string><string name="bounty_message_resource_format_s" translatable="false">%s</string><string name="bounty_message_tool_format_s">%s unlocked!</string><string name="bounty_message_tool_slot">New slot unlocked</string><string name="bounty_message_shape_unlocked">New shape unlocked</string><string name="level_button_format_d">Level: %d</string><string name="price_button_buy">Buy</string><string name="price_button_upgrade">Upgrade</string><string name="playershape_name_ball">Ball</string><string name="playershape_name_clock">Clock</string><string name="playershape_name_hypno_spiral">Hypno</string><string name="playershape_name_pacman">Pacman</string><string name="playershape_name_smiley">Smiley</string><string name="playershape_name_wheel">Wheel</string><string name="playershape_name_sun">Sun</string><string name="playershape_name_blue">I\'m blue</string><string name="playershape_name_locked" translatable="false">\?\?\?</string><string name="playershape_description_ball" translatable="false">Keep calm and roll on</string><string name="playershape_description_clock" translatable="false">Tick tack!</string><string name="playershape_description_hypno_spiral">Hypnotizes you for more fun</string><string name="playershape_description_pacman" translatable="false">PACMAN!</string><string name="playershape_description_smiley" translatable="false">Don\'t worry, roll happy!</string><string name="playershape_description_wheel">A nice car without the... car</string><string name="playershape_description_sun">Shine bright like the sun</string><string name="playershape_description_blue">Why am I blue?</string><string name="playershape_description_locked">A new shape for more fun</string><string name="task_empty">Empty task</string><string name="task_collect_stars_progress_format_ddd">Collect %d stars (%d/%d)</string><string name="task_collect_energy_progress_format_ddd">Collect %d energy (%d/%d)</string><string name="task_collect_stars_format_d">Collect %d stars</string><string name="task_collect_energy_format_d">Collect %d energy</string><string name="task_complete_world_format_d">Finish the %d. world</string><string name="world_button_count_format_dd" translatable="false">%d/%d</string><string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string><string name="tool_description_ramp">Roll up the ramp to gain height</string><string name="tool_description_spring">Shoots you in the air</string><string name="tool_description_magnet">You are pulled towards it. Just try it out!</string><string name="tool_description_bomb">Blow up all obstacles near the bomb</string><string name="tool_description_power_mushroom">This will give you super-powers for a few seconds</string><string name="tool_description_stasis">Freezes a certain area which leads to longer in-air time</string><string name="tool_name_locked" translatable="false">\?\?\?</string><string name="tool_name_ramp">Ramp</string><string name="tool_name_spring">Spring</string><string name="tool_name_magnet">Magnet</string><string name="tool_name_bomb">Bomb</string><string name="tool_name_power_mushroom">Mushroom</string><string name="tool_name_stasis">Stasis</string><string name="tool_level_format_d" translatable="false">Level: %d</string><string name="confirm_dialog_button_yes">Yes</string><string name="confirm_dialog_button_no">No</string><string name="confirm_dialog_placeholder">This is a beautiful ConfirmDialog placeholder!</string><string name="confirm_dialog_exit">Do you really want to exit the game?</string><string name="confirm_dialog_reset">Do you really want to reset ALL your progress?</string><string name="confirm_dialog_finish_world_1">Do you really want to finish the first world?\nYour old progress will be DELETED!</string><string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string><string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string><string name="tutorial_place_tools">Click anywhere on the screen to place the ramp</string><string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string><string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string><string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</string><string name="tutorial_place_ramp_air_2">Now try again!</string><string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string><string name="tutorial_spring_equipped">Well done! Now you can start the next level</string><string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string><string name="tutorial_switch_tools_switch">To select a tool just click on it</string><string name="credits_title" translatable="false">ENDLESS ROLL</string><string name="credits_author">by Frajul</string><string name="credits_testers_title">TESTERS</string><string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string><string name="credits_sounds_title" translatable="false">SOUNDS</string><string name="credits_sounds" translatable="false">„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)</string><string name="credits_music_title">MUSIC</string><string name="credits_music" translatable="false">\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/</string></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    </string-array></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/attr.xml" qualifiers=""/><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/colors.xml" qualifiers=""><color name="primary">#17b3f5</color><color name="primary_dark">#1791f5</color><color name="secondary">#ffb637</color><color name="secondary_light">#ffeb37</color><color name="secondary_dark">#ff8e37</color><color name="secondary_little_transparent">#e2ffb637</color><color name="secondary_much_transparent">#57ffb637</color><color name="red">#ff0000</color><color name="black">#000000</color><color name="transparent">#00000000</color><color name="message_buttons">#daf10d</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="background_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color><color name="settings_button_disabled">#c7b7b7b7</color></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/dimen.xml" qualifiers=""><dimen name="credits_margin_between_categories">30dp</dimen><dimen name="tool_inspector_width">170dp</dimen><dimen name="shape_inspector_width">170dp</dimen><dimen name="tool_button_width">70dp</dimen><dimen name="tool_button_height">60dp</dimen></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/strings.xml" qualifiers=""><string name="app_name" translatable="false">Endless Roll</string><string name="placeholder_button">Click me!</string><string name="placeholder_textview">I\'m a text!</string><string name="placeholder_number" translatable="false">997.5</string><string name="settings_show_fps">Show Fps</string><string name="game_bomb_error_message">Set the bomb on an obstacle</string><string name="game_playerprogress_placeholder" translatable="false">0.0m</string><string name="game_playerprogress_format_f" translatable="false">%.1fm</string><string name="game_playerspeed_placeholder" translatable="false">0.0m/s</string><string name="game_playerspeed_format_f" translatable="false">%.1fm/s</string><string name="game_fps_placeholder" translatable="false">Fps: 00</string><string name="game_fps_format_d" translatable="false">Fps: %d</string><string name="game_countdown_placeholder" translatable="false">3</string><string name="levelup" translatable="false">Level Up</string><string name="message_game_over" translatable="false">GAME OVER</string><string name="message_level_finished">LEVEL FINISHED</string><string name="message_to_menu">To menu</string><string name="message_try_again">Try again</string><string name="message_restart">Restart</string><string name="goal_message_restart_format_d">Restart level %d</string><string name="goal_message_next_level_format_d">Next level: %d</string><string name="goal_message_next_world_format_s">Next world:\n%s</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_exit">Exit</string><string name="start_screen_play">Play</string><string name="start_screen_unlock_all_levels" translatable="false">Unlock all levels</string><string name="start_screen_gain_90_ep" translatable="false">Gain 90 ep</string><string name="start_screen_finish_world_1">Finish the first world!</string><string name="start_screen_to_gl_test_screen" translatable="false">Test GL Stuff!!!</string><string name="topbar_level_placeholder" translatable="false">Level: 24</string><string name="topbar_level_format_d" translatable="false">Level: %d</string><string name="settings_reset">Reset progress</string><string name="settings_credits" translatable="false">Credits</string><string name="settings_music">Music</string><string name="settings_sounds" translatable="false">Sounds</string><string name="unlock_message_placeholder">Ramp unlocked</string><string name="world_button_title_placeholder">Great world</string><string name="world_button_progress_placeholder" translatable="false">21/15</string><string name="bounty_message_resource_format_s" translatable="false">%s</string><string name="bounty_message_tool_format_s">%s unlocked!</string><string name="bounty_message_tool_slot">New slot unlocked</string><string name="bounty_message_shape_unlocked">New shape unlocked</string><string name="level_button_format_d">Level: %d</string><string name="price_button_buy">Buy</string><string name="price_button_upgrade">Upgrade</string><string name="playershape_name_ball">Ball</string><string name="playershape_name_clock">Clock</string><string name="playershape_name_hypno_spiral">Hypno</string><string name="playershape_name_pacman">Pacman</string><string name="playershape_name_smiley">Smiley</string><string name="playershape_name_wheel">Wheel</string><string name="playershape_name_sun">Sun</string><string name="playershape_name_blue">I\'m blue</string><string name="playershape_name_locked" translatable="false">\?\?\?</string><string name="playershape_description_ball" translatable="false">Keep calm and roll on</string><string name="playershape_description_clock" translatable="false">Tick tack!</string><string name="playershape_description_hypno_spiral">Hypnotizes you for more fun</string><string name="playershape_description_pacman" translatable="false">PACMAN!</string><string name="playershape_description_smiley" translatable="false">Don\'t worry, roll happy!</string><string name="playershape_description_wheel">A nice car without the... car</string><string name="playershape_description_sun">Shine bright like the sun</string><string name="playershape_description_blue">Why am I blue?</string><string name="playershape_description_locked">A new shape for more fun</string><string name="task_empty">Empty task</string><string name="task_collect_stars_progress_format_ddd">Collect %d stars (%d/%d)</string><string name="task_collect_energy_progress_format_ddd">Collect %d energy (%d/%d)</string><string name="task_collect_stars_format_d">Collect %d stars</string><string name="task_collect_energy_format_d">Collect %d energy</string><string name="task_complete_world_format_d">Finish the %d. world</string><string name="world_button_count_format_dd" translatable="false">%d/%d</string><string name="tool_description_locked_format_d">You will unlock this mysterious tool at level %d</string><string name="tool_description_ramp">Roll up the ramp to gain height</string><string name="tool_description_spring">Shoots you in the air</string><string name="tool_description_magnet">You are pulled towards it. Just try it out!</string><string name="tool_description_bomb">Blow up all obstacles near the bomb</string><string name="tool_description_power_mushroom">This will give you super-powers for a few seconds</string><string name="tool_description_stasis">Freezes a certain area which leads to longer in-air time</string><string name="tool_name_locked" translatable="false">\?\?\?</string><string name="tool_name_ramp">Ramp</string><string name="tool_name_spring">Spring</string><string name="tool_name_magnet">Magnet</string><string name="tool_name_bomb">Bomb</string><string name="tool_name_power_mushroom">Mushroom</string><string name="tool_name_stasis">Stasis</string><string name="tool_level_format_d" translatable="false">Level: %d</string><string name="confirm_dialog_button_yes">Yes</string><string name="confirm_dialog_button_no">No</string><string name="confirm_dialog_placeholder">This is a beautiful ConfirmDialog placeholder!</string><string name="confirm_dialog_exit">Do you really want to exit the game?</string><string name="confirm_dialog_reset">Do you really want to reset ALL your progress?</string><string name="confirm_dialog_finish_world_1">Do you really want to finish the first world?\nYour old progress will be DELETED!</string><string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string><string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string><string name="tutorial_place_tools">Click anywhere on the screen to place the ramp</string><string name="tutorial_place_ramp_gap">Try to place your ramp in front of the gap</string><string name="tutorial_place_ramp_obstacle">Great job!\nNow place it in front of the obstacle</string><string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTime carefully!</string><string name="tutorial_place_ramp_air_2">Now try again!</string><string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string><string name="tutorial_spring_equipped">Well done! Now you can start the next level</string><string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string><string name="tutorial_switch_tools_switch">To select a tool just click on it</string><string name="credits_title" translatable="false">ENDLESS ROLL</string><string name="credits_author">by Frajul</string><string name="credits_testers_title">TESTERS</string><string name="credits_testers" translatable="false">Tester1\nTester2\nTester3\nTester4</string><string name="credits_sounds_title" translatable="false">SOUNDS</string><string name="credits_sounds" translatable="false">„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)</string><string name="credits_music_title">MUSIC</string><string name="credits_music" translatable="false">\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/</string></file><file path="/mnt/FE6CC35E6CC31077/Users/Julian/AndroidStudioProjects/EndlessRoll/app/src/main/res/values/styles.xml" qualifiers=""><style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:buttonStyle">@style/GameButton</item>
         <item name="android:textColor">@color/black</item>
     </style><style name="GameButton">
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index 0f7c841..ad680a9 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -326,17 +326,18 @@ int color secondary_text_default_material_dark 0x7f05004c
 int color secondary_text_default_material_light 0x7f05004d
 int color secondary_text_disabled_material_dark 0x7f05004e
 int color secondary_text_disabled_material_light 0x7f05004f
-int color switch_thumb_disabled_material_dark 0x7f050050
-int color switch_thumb_disabled_material_light 0x7f050051
-int color switch_thumb_material_dark 0x7f050052
-int color switch_thumb_material_light 0x7f050053
-int color switch_thumb_normal_material_dark 0x7f050054
-int color switch_thumb_normal_material_light 0x7f050055
-int color toolslotDisabled 0x7f050056
-int color toolslotDisabledSelected 0x7f050057
-int color toolslotEnabled 0x7f050058
-int color toolslotEnabledSelected 0x7f050059
-int color transparent 0x7f05005a
+int color settings_button_disabled 0x7f050050
+int color switch_thumb_disabled_material_dark 0x7f050051
+int color switch_thumb_disabled_material_light 0x7f050052
+int color switch_thumb_material_dark 0x7f050053
+int color switch_thumb_material_light 0x7f050054
+int color switch_thumb_normal_material_dark 0x7f050055
+int color switch_thumb_normal_material_light 0x7f050056
+int color toolslotDisabled 0x7f050057
+int color toolslotDisabledSelected 0x7f050058
+int color toolslotEnabled 0x7f050059
+int color toolslotEnabledSelected 0x7f05005a
+int color transparent 0x7f05005b
 int dimen abc_action_bar_content_inset_material 0x7f060000
 int dimen abc_action_bar_default_height_material 0x7f060001
 int dimen abc_action_bar_default_padding_end_material 0x7f060002
diff --git a/app/src/main/assets/levelpacks/Grasslands.xml b/app/src/main/assets/levelpacks/Grasslands.xml
index 2a271d1..a862594 100644
--- a/app/src/main/assets/levelpacks/Grasslands.xml
+++ b/app/src/main/assets/levelpacks/Grasslands.xml
@@ -350,7 +350,7 @@
             </obstacleData>
          </obstacles>
          <stars class="java.util.ArrayList">
-            <positionData x="2.7666652" y="0.14000021"/>
+            <positionData x="2.7733319" y="0.4"/>
             <positionData x="6.406662" y="-0.4599995"/>
             <positionData x="14.950134" y="0.7333332"/>
          </stars>
diff --git a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
index 30565bc..e0e4f44 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
@@ -8,7 +8,6 @@ import android.content.res.Configuration;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.RelativeLayout;
@@ -169,6 +168,12 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
         }
     }
 
+    public void flipToScreenNonUiThreaded(final Screen.ScreenType screen) {
+        if (screen != Screen.ScreenType.NONE && flipper.getCurrentScreen().getType() != screen) {
+            flipper.showScreen(screen, flipper.getCurrentScreen().getType());
+        }
+    }
+
     public void onSurfaceChanged() {
         if (flipper.getCurrentScreen().getType() == Screen.ScreenType.PRE_START)
             flipToScreen(Screen.ScreenType.START);
@@ -346,8 +351,4 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
     public TutorialManager getTutorialManager() {
         return tutorialManager;
     }
-
-    public GameScreen getGameScreen() {
-        return gameScreen;
-    }
 }
diff --git a/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java b/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java
index 283a907..fcbc42c 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/MyGlSurfaceView.java
@@ -26,7 +26,7 @@ public class MyGlSurfaceView extends GLSurfaceView {
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        renderer.getCurrentRendering().onTouch(event.getX(), event.getY());
+        renderer.onTouch(event.getX(), event.getY());
         return true;
     }
 
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
index 00dc32b..bc81c53 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
@@ -12,10 +12,12 @@ import de.frajul.endlessroll.rendering.renderer.GameRenderer;
  */
 public abstract class GLScreen<V extends ViewGroup> extends Screen<V> {
 
+    protected MyGlSurfaceView myGlSurfaceView;
     protected GameRenderer gameRenderer;
 
     public GLScreen(ScreenType type, GameActivity gameActivity, @LayoutRes int layoutId, MyGlSurfaceView glView) {
         super(type, gameActivity, layoutId);
+        this.myGlSurfaceView = glView;
         this.gameRenderer = glView.getRenderer();
     }
 
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
index 3168174..539b551 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/GameScreen.java
@@ -29,10 +29,10 @@ public class GameScreen extends GLScreen<RelativeLayout> {
 
     @Override
     public void prepareToBeShown() {
-        gameActivity.getSoundManager().menuMusic.stop();
-
         gameRenderer.setCurrentRendering(game);
         game.getViewManager().prepareToBeShown();
+
+        gameActivity.getSoundManager().menuMusic.stop();
     }
 
     public void onPause() {
@@ -76,8 +76,8 @@ public class GameScreen extends GLScreen<RelativeLayout> {
 
         @Override
         public void toScreen(ScreenType screen) {
-            gameRenderer.setCurrentRendering(null);
             gameActivity.flipToScreen(screen);
+            gameRenderer.setCurrentRendering(null);
         }
 
         @Override
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
index 252473b..5c3c3ef 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
@@ -11,6 +11,7 @@ import de.frajul.endlessroll.R;
 import de.frajul.endlessroll.main.GameActivity;
 import de.frajul.endlessroll.main.MyGlSurfaceView;
 import de.frajul.endlessroll.main.game.StartScene;
+import de.frajul.endlessroll.main.game.Timer;
 import de.frajul.endlessroll.sqlDatabase.MyDatabase;
 import de.frajul.endlessroll.views.ConfirmDialog;
 
@@ -57,11 +58,11 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
 
     @Override
     public void prepareToBeShown() {
-        gameActivity.getSoundManager().menuMusic.start();
-
         ((StartScene) rendering.getScene()).randomizeWorld();
         ((StartScene) rendering.getScene()).loadTexturesForCurrentWorld();
         gameRenderer.setCurrentRendering(rendering);
+
+        gameActivity.getSoundManager().menuMusic.start();
     }
 
     @Override
diff --git a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java
index 2fcd726..354b24e 100644
--- a/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java
+++ b/app/src/main/java/de/frajul/endlessroll/rendering/renderer/GameRenderer.java
@@ -37,6 +37,7 @@ import de.frajul.endlessroll.rendering.shader.TerrainShader;
 public class GameRenderer implements GLSurfaceView.Renderer {
 
     private List<Rendering> renderTargets = new ArrayList<>();
+    private final Object currentRenderingLock = new Object();
     private Rendering currentRendering;
     private MatrixCreator matrixCreator;
 
@@ -60,22 +61,27 @@ public class GameRenderer implements GLSurfaceView.Renderer {
         particleRenderer = new ParticleRenderer(activity, quad, matrixCreator);
     }
 
-    public void addRenderTarget(Rendering renderTarget){
+    public void addRenderTarget(Rendering renderTarget) {
         renderTargets.add(renderTarget);
     }
 
     public void setCurrentRendering(Rendering currentRendering) {
-        this.currentRendering = currentRendering;
+        synchronized (currentRenderingLock) {
+            this.currentRendering = currentRendering;
+        }
     }
 
-    public Rendering getCurrentRendering() {
-        return currentRendering;
+    public void onTouch(float x, float y) {
+        synchronized (currentRenderingLock) {
+            if(currentRendering != null)
+            currentRendering.onTouch(x, y);
+        }
     }
 
     @Override
     public void onSurfaceCreated(GL10 gl, EGLConfig config) {
         GameLog.d("onSurfaceCreated");
-        GLES20.glClearColor(1, 1, 1, 1.0f);
+        GLES20.glClearColor(1, 0, 1, 1.0f);
         gl.glEnable(GL10.GL_BLEND);
         gl.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
 
@@ -91,7 +97,7 @@ public class GameRenderer implements GLSurfaceView.Renderer {
         } catch (Exception e) {
             activity.onException(e);
         }
-        for(Rendering renderTarget : renderTargets)
+        for (Rendering renderTarget : renderTargets)
             renderTarget.initiate(texturePack, timer);
     }
 
@@ -101,7 +107,7 @@ public class GameRenderer implements GLSurfaceView.Renderer {
         particleRenderer.createFbo(width, height);
         GLES20.glViewport(0, 0, width, height);
         matrixCreator.setMVPMSize(width, height);
-        for(Rendering renderTarget : renderTargets)
+        for (Rendering renderTarget : renderTargets)
             renderTarget.setScreenSize(width, height);
         activity.onSurfaceChanged();
     }
@@ -109,27 +115,29 @@ public class GameRenderer implements GLSurfaceView.Renderer {
     @Override
     public synchronized void onDrawFrame(GL10 gl) {
         timer.update();
-        if (currentRendering != null) {
-            currentRendering.update();
-            Scene scene = currentRendering.getScene();
+        synchronized (currentRenderingLock) {
+            if (currentRendering != null) {
+                currentRendering.update();
+                Scene scene = currentRendering.getScene();
 
-            particleRenderer.renderParticlesToFbo(gl, scene);
+                particleRenderer.renderParticlesToFbo(gl, scene);
 
-            GLES20.glClearColor(1, 1, 1, 1.0f);
-            GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
+                GLES20.glClearColor(1, 1, 1, 1.0f);
+                GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
 
-            renderBackground(gl, scene);
-            renderTileList(gl, scene.getTerrain(), scene);
-            renderTileList(gl, scene.getCeiling(), scene);
-            renderEntityList(gl, scene.getCollectables(), scene.getCamera());
-            renderObstacles(gl, scene);
-            renderEntityList(gl, scene.getTools(), scene.getCamera());
+                renderBackground(gl, scene);
+                renderTileList(gl, scene.getTerrain(), scene);
+                renderTileList(gl, scene.getCeiling(), scene);
+                renderEntityList(gl, scene.getCollectables(), scene.getCamera());
+                renderObstacles(gl, scene);
+                renderEntityList(gl, scene.getTools(), scene.getCamera());
 
-            renderEntityList(gl, scene.getUncategorizedEntities(), scene.getCamera());
+                renderEntityList(gl, scene.getUncategorizedEntities(), scene.getCamera());
 
-            renderFbo(gl);
+                renderFbo(gl);
 
-            renderGuis(gl, scene.getGuis());
+                renderGuis(gl, scene.getGuis());
+            }
         }
     }
 
diff --git a/app/src/main/res/drawable/xml_selector_settings_button.xml b/app/src/main/res/drawable/xml_selector_settings_button.xml
index c01fac5..efe0822 100644
--- a/app/src/main/res/drawable/xml_selector_settings_button.xml
+++ b/app/src/main/res/drawable/xml_selector_settings_button.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true">
+    <item android:state_pressed="true" android:state_enabled="true">
         <shape>
             <solid android:color="@color/secondary_much_transparent"/>
             <corners android:radius="5dp"/>
@@ -11,7 +11,7 @@
             <stroke android:width="1dp" android:color="@color/secondary_dark"/>
         </shape>
     </item>
-    <item android:state_pressed="false">
+    <item android:state_pressed="false" android:state_enabled="true">
         <shape>
             <solid android:color="@color/transparent"/>
             <corners android:radius="5dp"/>
@@ -22,4 +22,15 @@
             <stroke android:width="1dp" android:color="@color/secondary_dark"/>
         </shape>
     </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/settings_button_disabled"/>
+            <corners android:radius="5dp"/>
+            <padding android:right="5dp"
+                android:left="5dp"
+                android:top="5dp"
+                android:bottom="5dp"/>
+            <stroke android:width="1dp" android:color="@color/secondary_dark"/>
+        </shape>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 219fb03..44e5624 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,6 +15,7 @@
     <color name="transparent">#00000000</color>
 
     <color name="message_buttons">#daf10d</color>
+    <color name="settings_button_disabled">#c7b7b7b7</color>
 
     <color name="toolslotDisabled">#715f5f</color>
     <color name="toolslotDisabledSelected">#60715f</color>