From 5302ac0d007feb5bef5c02f004d59b83d1b6c0bc Mon Sep 17 00:00:00 2001
From: = <=>
Date: Sun, 21 Jan 2018 17:40:25 +0100
Subject: [PATCH] Changed overall style Now one can change directly between
 Screens from TopBar Fixed bugs

---
 .../debug/android/support/v7/appcompat/R.java |  28 ++--
 .../mergeDebugResources/merger.xml            |   2 +-
 app/build/intermediates/symbols/debug/R.txt   | 142 +++++++++---------
 .../frajul/endlessroll/main/GameActivity.java |  15 ++
 .../endlessroll/main/screens/GameScreen.java  |   5 +
 .../main/screens/PlayerShapeShopScreen.java   |   1 +
 .../main/screens/SettingsScreen.java          |  16 +-
 .../endlessroll/main/screens/StartScreen.java |   8 +-
 .../main/screens/ToolShopScreen.java          |   1 +
 .../de/frajul/endlessroll/views/TopBar.java   |  30 ++--
 .../frajul/endlessroll/views/ViewManager.java |   4 +
 .../drawable/xml_background_levelbutton.xml   |   2 +-
 .../drawable/xml_background_worldbutton.xml   |   6 +-
 .../res/drawable/xml_selector_gamebutton.xml  |  27 ++--
 app/src/main/res/layout/pre_start_screen.xml  |   3 +-
 app/src/main/res/layout/start_screen.xml      |  32 ++--
 app/src/main/res/layout/topbar.xml            |   8 +-
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   4 +-
 19 files changed, 181 insertions(+), 154 deletions(-)

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 747c59c..bd53bc7 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
@@ -538,20 +538,20 @@ public final class R {
         public static final int src_atop = 0x7f08008e;
         public static final int src_in = 0x7f08008f;
         public static final int src_over = 0x7f080090;
-        public static final int status_bar_latest_event_content = 0x7f080097;
-        public static final int submit_area = 0x7f080098;
-        public static final int tabMode = 0x7f080099;
-        public static final int text = 0x7f08009b;
-        public static final int text2 = 0x7f08009c;
-        public static final int textSpacerNoButtons = 0x7f08009d;
-        public static final int time = 0x7f08009e;
-        public static final int title = 0x7f08009f;
-        public static final int title_template = 0x7f0800a0;
-        public static final int topPanel = 0x7f0800bd;
-        public static final int up = 0x7f0800cf;
-        public static final int useLogo = 0x7f0800d0;
-        public static final int withText = 0x7f0800d1;
-        public static final int wrap_content = 0x7f0800da;
+        public static final int status_bar_latest_event_content = 0x7f080096;
+        public static final int submit_area = 0x7f080097;
+        public static final int tabMode = 0x7f080098;
+        public static final int text = 0x7f08009a;
+        public static final int text2 = 0x7f08009b;
+        public static final int textSpacerNoButtons = 0x7f08009c;
+        public static final int time = 0x7f08009d;
+        public static final int title = 0x7f08009e;
+        public static final int title_template = 0x7f08009f;
+        public static final int topPanel = 0x7f0800bc;
+        public static final int up = 0x7f0800ce;
+        public static final int useLogo = 0x7f0800cf;
+        public static final int withText = 0x7f0800d0;
+        public static final int wrap_content = 0x7f0800d9;
     }
     public static final class integer {
         public static final int abc_config_activityDefaultDur = 0x7f090000;
diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
index bd81c96..6d734bf 100644
--- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml
@@ -1352,7 +1352,7 @@
         <item>Icy Mountains</item>
         <item>Testcave</item>
         <item>Mysterious fireworld</item>
-    </string-array></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\colors.xml" qualifiers=""><color name="level_finished">#ffda45</color><color name="game_over">#f11e6f</color><color name="retry">#39be27</color><color name="game_progress_text">#ffb405</color><color name="message_views">#daf10d</color><color name="toolbuttonInactiveNotReady">#db911c0f</color><color name="toolbuttonInactiveReady">#dbfff200</color><color name="toolbuttonActiveNotReady">#e5dc1522</color><color name="toolbuttonActiveReady">#db41e42b</color><color name="toolbuttonLocked">#db494b49</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="countdown3">#f0f41e02</color><color name="countdown2">#f0f28117</color><color name="countdown1">#f0d7b106</color><color name="background_levelup_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\dimen.xml" qualifiers=""><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="C:\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="placeholder_percent" translatable="false">85.1%</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="task_completed">Task completed</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_tools">Tools</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="message_next_level">Next level</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">Go to the next world:\n%s</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_restart">Restart</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 (Yes! It\'s magic!)</string><string name="start_screen_gain_90_ep" translatable="false">Gain 90 ep (Nope! No magic at all!)</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="tool_upgrade_title_placeholder">Time (Lv12)</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="topbar_toolshop">Toolshop</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_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_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="tool_upgrade_title_format_sd" translatable="false">%1$s (Lv%2$d)</string><string name="tool_upgrade_none">None</string><string name="tool_upgrade_time">Time</string><string name="tool_upgrade_radius">Radius</string><string name="tool_upgrade_force">Force</string><string name="tool_upgrade_value_max" translatable="false">Max.</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></file><file path="C:\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="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\colors.xml" qualifiers=""><color name="level_finished">#ffda45</color><color name="game_over">#f11e6f</color><color name="retry">#39be27</color><color name="game_progress_text">#ffb405</color><color name="message_views">#daf10d</color><color name="toolbuttonInactiveNotReady">#db911c0f</color><color name="toolbuttonInactiveReady">#dbfff200</color><color name="toolbuttonActiveNotReady">#e5dc1522</color><color name="toolbuttonActiveReady">#db41e42b</color><color name="toolbuttonLocked">#db494b49</color><color name="toolslotDisabled">#715f5f</color><color name="toolslotDisabledSelected">#60715f</color><color name="toolslotEnabled">#db41e42b</color><color name="toolslotEnabledSelected">#b3d700</color><color name="countdown3">#f0f41e02</color><color name="countdown2">#f0f28117</color><color name="countdown1">#f0d7b106</color><color name="background_levelup_message">#9d000000</color><color name="background_short_menu">#5b000000</color><color name="background_tutorial">#3d000000</color><color name="topbar">#cf664c</color></file><file path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\res\values\dimen.xml" qualifiers=""><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="C:\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="placeholder_percent" translatable="false">85.1%</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="task_completed">Task completed</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_tools">Tools</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="message_next_level">Next level</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">Go to the next world:\n%s</string><string name="pre_start_screen_loading">LOADING...</string><string name="short_menu_continue">Continue</string><string name="short_menu_restart">Restart</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="tool_upgrade_title_placeholder">Time (Lv12)</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="topbar_toolshop">Toolshop</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_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_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="tool_upgrade_title_format_sd" translatable="false">%1$s (Lv%2$d)</string><string name="tool_upgrade_none">None</string><string name="tool_upgrade_time">Time</string><string name="tool_upgrade_radius">Radius</string><string name="tool_upgrade_force">Force</string><string name="tool_upgrade_value_max" translatable="false">Max.</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></file><file path="C:\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">#000000</item>
     </style><style name="GameButton">
diff --git a/app/build/intermediates/symbols/debug/R.txt b/app/build/intermediates/symbols/debug/R.txt
index 374dba4..a44c056 100644
--- a/app/build/intermediates/symbols/debug/R.txt
+++ b/app/build/intermediates/symbols/debug/R.txt
@@ -325,6 +325,7 @@ int color toolslotDisabled 0x7f050056
 int color toolslotDisabledSelected 0x7f050057
 int color toolslotEnabled 0x7f050058
 int color toolslotEnabledSelected 0x7f050059
+int color topbar 0x7f05005a
 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
@@ -716,77 +717,76 @@ int id src_over 0x7f080090
 int id startscreen_finish_world_1 0x7f080091
 int id startscreen_gain_90_ep 0x7f080092
 int id startscreen_play 0x7f080093
-int id startscreen_settings 0x7f080094
-int id startscreen_to_gl_test_screen 0x7f080095
-int id startscreen_unlock_levels 0x7f080096
-int id status_bar_latest_event_content 0x7f080097
-int id submit_area 0x7f080098
-int id tabMode 0x7f080099
-int id task_completed_unlock_list 0x7f08009a
-int id text 0x7f08009b
-int id text2 0x7f08009c
-int id textSpacerNoButtons 0x7f08009d
-int id time 0x7f08009e
-int id title 0x7f08009f
-int id title_template 0x7f0800a0
-int id tool_button_animation_layer 0x7f0800a1
-int id tool_button_background_layer 0x7f0800a2
-int id tool_button_progress_bar 0x7f0800a3
-int id tool_inspector_description 0x7f0800a4
-int id tool_inspector_imageview 0x7f0800a5
-int id tool_inspector_level_view 0x7f0800a6
-int id tool_inspector_pricebutton 0x7f0800a7
-int id tool_inspector_title 0x7f0800a8
-int id tool_upgrade_imageview 0x7f0800a9
-int id tool_upgrade_pricebutton 0x7f0800aa
-int id tool_upgrade_title 0x7f0800ab
-int id tool_upgrade_value_new 0x7f0800ac
-int id tool_upgrade_value_old 0x7f0800ad
-int id toolbutton_1 0x7f0800ae
-int id toolbutton_2 0x7f0800af
-int id toolbutton_3 0x7f0800b0
-int id toolbutton_4 0x7f0800b1
-int id toolofferslot_slot 0x7f0800b2
-int id toolofferslot_title 0x7f0800b3
-int id toolshop_slot1 0x7f0800b4
-int id toolshop_slot2 0x7f0800b5
-int id toolshop_slot3 0x7f0800b6
-int id toolshop_slot4 0x7f0800b7
-int id toolshop_tool_offer_bottom_row 0x7f0800b8
-int id toolshop_tool_offer_top_row 0x7f0800b9
-int id toolshop_toolinspector 0x7f0800ba
-int id toolshop_topbar 0x7f0800bb
-int id toolslot_image 0x7f0800bc
-int id topPanel 0x7f0800bd
-int id topbar_energycount 0x7f0800be
-int id topbar_energycount_decrease 0x7f0800bf
-int id topbar_energyview 0x7f0800c0
-int id topbar_layout 0x7f0800c1
-int id topbar_leveldisplay 0x7f0800c2
-int id topbar_levellayout 0x7f0800c3
-int id topbar_levelprogress 0x7f0800c4
-int id topbar_settings 0x7f0800c5
-int id topbar_shapeshop 0x7f0800c6
-int id topbar_starcount 0x7f0800c7
-int id topbar_starcount_decrease 0x7f0800c8
-int id topbar_starview 0x7f0800c9
-int id topbar_toolshop 0x7f0800ca
-int id tutorial_image_view 0x7f0800cb
-int id tutorial_text_view 0x7f0800cc
-int id unlockmessage_message 0x7f0800cd
-int id unlockmessage_toolimage 0x7f0800ce
-int id up 0x7f0800cf
-int id useLogo 0x7f0800d0
-int id withText 0x7f0800d1
-int id worldbutton_energycount 0x7f0800d2
-int id worldbutton_levelcount 0x7f0800d3
-int id worldbutton_lock 0x7f0800d4
-int id worldbutton_preview 0x7f0800d5
-int id worldbutton_starcount 0x7f0800d6
-int id worldbutton_title 0x7f0800d7
-int id worlds_layout 0x7f0800d8
-int id worlds_topbar 0x7f0800d9
-int id wrap_content 0x7f0800da
+int id startscreen_to_gl_test_screen 0x7f080094
+int id startscreen_unlock_levels 0x7f080095
+int id status_bar_latest_event_content 0x7f080096
+int id submit_area 0x7f080097
+int id tabMode 0x7f080098
+int id task_completed_unlock_list 0x7f080099
+int id text 0x7f08009a
+int id text2 0x7f08009b
+int id textSpacerNoButtons 0x7f08009c
+int id time 0x7f08009d
+int id title 0x7f08009e
+int id title_template 0x7f08009f
+int id tool_button_animation_layer 0x7f0800a0
+int id tool_button_background_layer 0x7f0800a1
+int id tool_button_progress_bar 0x7f0800a2
+int id tool_inspector_description 0x7f0800a3
+int id tool_inspector_imageview 0x7f0800a4
+int id tool_inspector_level_view 0x7f0800a5
+int id tool_inspector_pricebutton 0x7f0800a6
+int id tool_inspector_title 0x7f0800a7
+int id tool_upgrade_imageview 0x7f0800a8
+int id tool_upgrade_pricebutton 0x7f0800a9
+int id tool_upgrade_title 0x7f0800aa
+int id tool_upgrade_value_new 0x7f0800ab
+int id tool_upgrade_value_old 0x7f0800ac
+int id toolbutton_1 0x7f0800ad
+int id toolbutton_2 0x7f0800ae
+int id toolbutton_3 0x7f0800af
+int id toolbutton_4 0x7f0800b0
+int id toolofferslot_slot 0x7f0800b1
+int id toolofferslot_title 0x7f0800b2
+int id toolshop_slot1 0x7f0800b3
+int id toolshop_slot2 0x7f0800b4
+int id toolshop_slot3 0x7f0800b5
+int id toolshop_slot4 0x7f0800b6
+int id toolshop_tool_offer_bottom_row 0x7f0800b7
+int id toolshop_tool_offer_top_row 0x7f0800b8
+int id toolshop_toolinspector 0x7f0800b9
+int id toolshop_topbar 0x7f0800ba
+int id toolslot_image 0x7f0800bb
+int id topPanel 0x7f0800bc
+int id topbar_energycount 0x7f0800bd
+int id topbar_energycount_decrease 0x7f0800be
+int id topbar_energyview 0x7f0800bf
+int id topbar_layout 0x7f0800c0
+int id topbar_leveldisplay 0x7f0800c1
+int id topbar_levellayout 0x7f0800c2
+int id topbar_levelprogress 0x7f0800c3
+int id topbar_settings 0x7f0800c4
+int id topbar_shapeshop 0x7f0800c5
+int id topbar_starcount 0x7f0800c6
+int id topbar_starcount_decrease 0x7f0800c7
+int id topbar_starview 0x7f0800c8
+int id topbar_toolshop 0x7f0800c9
+int id tutorial_image_view 0x7f0800ca
+int id tutorial_text_view 0x7f0800cb
+int id unlockmessage_message 0x7f0800cc
+int id unlockmessage_toolimage 0x7f0800cd
+int id up 0x7f0800ce
+int id useLogo 0x7f0800cf
+int id withText 0x7f0800d0
+int id worldbutton_energycount 0x7f0800d1
+int id worldbutton_levelcount 0x7f0800d2
+int id worldbutton_lock 0x7f0800d3
+int id worldbutton_preview 0x7f0800d4
+int id worldbutton_starcount 0x7f0800d5
+int id worldbutton_title 0x7f0800d6
+int id worlds_layout 0x7f0800d7
+int id worlds_topbar 0x7f0800d8
+int id wrap_content 0x7f0800d9
 int integer abc_config_activityDefaultDur 0x7f090000
 int integer abc_config_activityShortDur 0x7f090001
 int integer abc_max_action_buttons 0x7f090002
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 30ab461..0fae70a 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/GameActivity.java
@@ -138,6 +138,21 @@ public class GameActivity extends Activity implements ExceptionHandler, User.LvU
         super.finish();
     }
 
+    public boolean isShortMenuInGameActive() {
+        return gameScreen.getGameViewManager().isShortMenuVisible();
+    }
+
+    public void flipToScreen(final Screen.ScreenType screen, final Screen.ScreenType caller) {
+        if (screen != Screen.ScreenType.NONE && flipper.getCurrentScreen().getType() != screen) {
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    flipper.showScreen(screen, caller);
+                }
+            });
+        }
+    }
+
     public void flipToScreen(final Screen.ScreenType screen) {
         if (screen != Screen.ScreenType.NONE && flipper.getCurrentScreen().getType() != screen) {
             runOnUiThread(new Runnable() {
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 35ac72d..305ecf2 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
@@ -13,6 +13,7 @@ import de.frajul.endlessroll.main.MyGlSurfaceView;
 import de.frajul.endlessroll.main.game.Game;
 import de.frajul.endlessroll.main.game.GameState;
 import de.frajul.endlessroll.main.tutorial.BreakPoint;
+import de.frajul.endlessroll.views.ViewManager;
 
 /**
  * Created by Julian on 08.02.2016.
@@ -51,6 +52,10 @@ public class GameScreen extends GLScreen<RelativeLayout> {
         return game.getGameState() == GameState.LEVEL_FINISHED;
     }
 
+    public ViewManager getGameViewManager(){
+        return game.getViewManager();
+    }
+
     @Override
     public void onBackKeyDown() {
         game.tryToPause();
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
index 4f7ec62..48b9811 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
@@ -67,6 +67,7 @@ public class PlayerShapeShopScreen extends Screen<RelativeLayout> implements Pla
 
         createViews();
         topBar.update();
+        topBar.setCustomCallerForScreenSwitch(super.caller);
     }
 
     @Override
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
index 2dfca45..5caf706 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
@@ -22,7 +22,6 @@ public class SettingsScreen extends Screen<LinearLayout> implements View.OnClick
     private ToggleButton musicToggle;
     private ToggleButton soundToggle;
     private Button resetButton;
-    private boolean resetPressed = false;
 
     private ConfirmDialog resetConfirmDialog;
 
@@ -44,10 +43,12 @@ public class SettingsScreen extends Screen<LinearLayout> implements View.OnClick
         gameActivity.getSoundManager().menuMusic.start();
 
         topBar.update();
+        topBar.setCustomCallerForScreenSwitch(super.caller);
+        topBar.setShopsEnabled(!gameActivity.isShortMenuInGameActive());
+
         musicToggle.setChecked(!gameActivity.getSoundManager().isMusicMuted());
         soundToggle.setChecked(!gameActivity.getSoundManager().isSoundsMuted());
         resetButton.setEnabled(super.caller != ScreenType.GAME);
-        resetPressed = false;
     }
 
     @Override
@@ -56,10 +57,7 @@ public class SettingsScreen extends Screen<LinearLayout> implements View.OnClick
                 .writeSoundsMuted(gameActivity.getSoundManager().isSoundsMuted());
         gameActivity.getDataStorageHandler()
                 .writeMusicMuted(gameActivity.getSoundManager().isMusicMuted());
-        //ResetButton is disabled if caller is GAME, because shortMenu or GoalMessage would still be visible on next level start
-        if (resetPressed && (super.caller == ScreenType.LEVELS || super.caller == ScreenType.GAME)) {
-            super.caller = ScreenType.WORLDS;
-        }
+
         flipToCaller();
     }
 
@@ -79,7 +77,11 @@ public class SettingsScreen extends Screen<LinearLayout> implements View.OnClick
         if (callId == CALL_ID_CONFIRM_RESET) {
             gameActivity.resetData();
             prepareToBeShown();
-            resetPressed = true;
+            //ResetButton is disabled if caller is GAME, because shortMenu or GoalMessage would still be visible on next level start
+            if (super.caller == ScreenType.LEVELS || super.caller == ScreenType.GAME) {
+                super.caller = ScreenType.WORLDS;
+                topBar.setCustomCallerForScreenSwitch(super.caller);
+            }
         }
     }
 }
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 e49754e..fc958fc 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
@@ -29,7 +29,6 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
     private Button gain90EP;
     private Button finishFirstWorld;
     private Button toGlTestScreen;
-    private Button settings;
 
     private ConfirmDialog confirmDialog;
 
@@ -43,8 +42,6 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
         gain90EP = createButton(R.id.startscreen_gain_90_ep, typeface);
         finishFirstWorld = createButton(R.id.startscreen_finish_world_1, typeface);
         toGlTestScreen = createButton(R.id.startscreen_to_gl_test_screen, typeface);
-        settings = (Button) layout.findViewById(R.id.startscreen_settings);
-        settings.setOnClickListener(this);
 
         confirmDialog = new ConfirmDialog(gameActivity, this);
 
@@ -63,9 +60,9 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
     public void prepareToBeShown() {
         gameActivity.getSoundManager().menuMusic.start();
 
-        glView.setCurrentRendering(rendering);
         ((StartScene) rendering.getScene()).randomizeWorld();
         ((StartScene) rendering.getScene()).loadTexturesForCurrentWorld();
+        glView.setCurrentRendering(rendering);
     }
 
     @Override
@@ -78,9 +75,6 @@ public class StartScreen extends GLScreen<RelativeLayout> implements View.OnClic
         if (v.equals(play)) {
             gameActivity.flipToScreen(ScreenType.WORLDS);
             glView.setCurrentRendering(null);
-        } else if (v.equals(settings)) {
-            gameActivity.flipToScreen(ScreenType.SETTINGS);
-            glView.setCurrentRendering(null);
         } else if (v.equals(gain90EP)) {
             gameActivity.getUser().gainEp(90, true);
         } else if (v.equals(unlockLevels)) {
diff --git a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
index 80503d8..792f49a 100644
--- a/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
+++ b/app/src/main/java/de/frajul/endlessroll/main/screens/ToolShopScreen.java
@@ -90,6 +90,7 @@ public class ToolShopScreen extends Screen<RelativeLayout> implements View.OnCli
         gameActivity.getSoundManager().menuMusic.start();
 
         topBar.update();
+        topBar.setCustomCallerForScreenSwitch(super.caller);
         slotSettings.unlockSlotsIfLevelReached(gameActivity.getUser().getLevelUpBounties());
         onToolOfferSlotSelected(toolOfferSlots.get(0));
 
diff --git a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java
index c6f14a9..8182dce 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/TopBar.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/TopBar.java
@@ -21,6 +21,7 @@ public class TopBar implements View.OnClickListener {
     private GameActivity gameActivity;
     private View layout;
     private Screen.ScreenType parent;
+    private Screen.ScreenType customCallerForScreenSwitch = Screen.ScreenType.NONE;
 
     private Animation starDecreaseAnimation;
     private Animation energyDecreaseAnimation;
@@ -59,11 +60,12 @@ public class TopBar implements View.OnClickListener {
         toolshopButton.setOnClickListener(this);
         shapeshopButton = (Button) layout.findViewById(R.id.topbar_shapeshop);
         shapeshopButton.setOnClickListener(this);
-        if (parent == Screen.ScreenType.TOOL_SHOP || parent == Screen.ScreenType.SHAPE_SHOP || parent == Screen.ScreenType.SETTINGS) {
-            toolshopButton.setEnabled(false);
-            shapeshopButton.setEnabled(false);
+        if(parent == Screen.ScreenType.SETTINGS)
             settingsButton.setEnabled(false);
-        }
+        if(parent == Screen.ScreenType.TOOL_SHOP)
+            toolshopButton.setEnabled(false);
+        if(parent == Screen.ScreenType.SHAPE_SHOP)
+            shapeshopButton.setEnabled(false);
         if (parent == Screen.ScreenType.GAME) {
             toolshopButton.setEnabled(false);
             shapeshopButton.setEnabled(false);
@@ -96,7 +98,7 @@ public class TopBar implements View.OnClickListener {
         gameActivity.getTutorialManager().onTopBarUpdate(this);
     }
 
-    public void startToolShopButtonPulse(){
+    public void startToolShopButtonPulse() {
         toolshopButton.startAnimation(toolShopPulse);
     }
 
@@ -110,22 +112,32 @@ public class TopBar implements View.OnClickListener {
         energyCountDecrease.startAnimation(energyDecreaseAnimation);
     }
 
+    public void setCustomCallerForScreenSwitch(Screen.ScreenType customCallerForScreenSwitch) {
+        this.customCallerForScreenSwitch = customCallerForScreenSwitch;
+    }
+
     @Override
     public void onClick(View v) {
         if (v.equals(toolshopButton)) {
-            gameActivity.flipToScreen(Screen.ScreenType.TOOL_SHOP);
+            flipToScreen(Screen.ScreenType.TOOL_SHOP);
         } else if (v.equals(shapeshopButton)) {
-            gameActivity.flipToScreen(Screen.ScreenType.SHAPE_SHOP);
+            flipToScreen(Screen.ScreenType.SHAPE_SHOP);
         } else if (v.equals(settingsButton)) {
-            gameActivity.flipToScreen(Screen.ScreenType.SETTINGS);
+            flipToScreen(Screen.ScreenType.SETTINGS);
         }
     }
 
+    private void flipToScreen(Screen.ScreenType screenType) {
+        if (customCallerForScreenSwitch != Screen.ScreenType.NONE)
+            gameActivity.flipToScreen(screenType, customCallerForScreenSwitch);
+        gameActivity.flipToScreen(screenType);
+    }
+
     public Screen.ScreenType getParent() {
         return parent;
     }
 
-    public boolean isToolShopButtonEnabled(){
+    public boolean isToolShopButtonEnabled() {
         return toolshopButton.isEnabled();
     }
 }
diff --git a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
index 2c45b72..2f23eb8 100644
--- a/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
+++ b/app/src/main/java/de/frajul/endlessroll/views/ViewManager.java
@@ -150,4 +150,8 @@ public class ViewManager implements View.OnClickListener {
         return ((int) (value * 20)) / 10f;
     }
 
+    public boolean isShortMenuVisible(){
+        return shortMenu.isVisible();
+    }
+
 }
diff --git a/app/src/main/res/drawable/xml_background_levelbutton.xml b/app/src/main/res/drawable/xml_background_levelbutton.xml
index 55ab491..f13fc43 100644
--- a/app/src/main/res/drawable/xml_background_levelbutton.xml
+++ b/app/src/main/res/drawable/xml_background_levelbutton.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="47dp" />
-    <solid android:color="#FF97A0F0" />
+    <solid android:color="#a997f0" />
     <padding
         android:bottom="10dp"
         android:left="15dp"
diff --git a/app/src/main/res/drawable/xml_background_worldbutton.xml b/app/src/main/res/drawable/xml_background_worldbutton.xml
index c2f3a75..7d33c97 100644
--- a/app/src/main/res/drawable/xml_background_worldbutton.xml
+++ b/app/src/main/res/drawable/xml_background_worldbutton.xml
@@ -5,8 +5,8 @@
     <gradient
         android:centerX="0%"
         android:centerY="0%"
-        android:endColor="#ff71a5"
-        android:startColor="#d7fd00"
+        android:endColor="#fd9400"
+        android:startColor="#f0fd00"
         android:angle="315"
         android:type="linear" />
     <padding
@@ -16,5 +16,5 @@
         android:top="10dp" />
     <stroke
         android:width="4dp"
-        android:color="#74ff71d0" />
+        android:color="#74ff8800" />
 </shape>
diff --git a/app/src/main/res/drawable/xml_selector_gamebutton.xml b/app/src/main/res/drawable/xml_selector_gamebutton.xml
index b4e0d6b..189e242 100644
--- a/app/src/main/res/drawable/xml_selector_gamebutton.xml
+++ b/app/src/main/res/drawable/xml_selector_gamebutton.xml
@@ -2,29 +2,26 @@
 <selector xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android" tools:context=".main.GameActivity">
     <item android:state_pressed="true" android:state_enabled="true">
         <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <solid android:color="#ef4444" />
+            <gradient android:type="linear" android:angle="90" android:startColor="#ca5f47" android:endColor="#f15841" />
+            <corners android:radius="7dp"/>
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp"/>
+            <stroke android:width="1dp" android:color="#992f2f"/>
         </shape>
     </item>
     <item android:state_pressed="false" android:state_enabled="true">
         <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <gradient android:angle="270" android:endColor="#992f2f" android:startColor="#ef4444" />
+            <gradient android:type="linear" android:angle="90" android:startColor="#d63e1c" android:endColor="#f53619" />
+            <corners android:radius="7dp"/>
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp"/>
+            <stroke android:width="1dp" android:color="#992f2f"/>
         </shape>
     </item>
     <item android:state_enabled="false">
         <shape>
-            <corners android:radius="20dp" />
-            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp" />
-            <stroke android:width="1dp" android:color="#992f2f" />
-
-            <gradient android:angle="270" android:endColor="#a15d5d" android:startColor="#b73d3d" />
+            <gradient android:type="linear" android:angle="90" android:startColor="#ac5441" android:endColor="#ae5243" />
+            <corners android:radius="7dp"/>
+            <padding android:bottom="10dp" android:left="10dp" android:right="10dp" android:top="10dp"/>
+            <stroke android:width="1dp" android:color="#992f2f"/>
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pre_start_screen.xml b/app/src/main/res/layout/pre_start_screen.xml
index 68e8c40..8dc5d65 100644
--- a/app/src/main/res/layout/pre_start_screen.xml
+++ b/app/src/main/res/layout/pre_start_screen.xml
@@ -2,14 +2,13 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#00ef78">
+    android:background="#41a6d1">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:text="@string/pre_start_screen_loading"
-        android:textAllCaps="false"
         android:textSize="30sp"
         android:textStyle="bold"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_screen.xml b/app/src/main/res/layout/start_screen.xml
index c760a1d..20b72f0 100644
--- a/app/src/main/res/layout/start_screen.xml
+++ b/app/src/main/res/layout/start_screen.xml
@@ -3,22 +3,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/startscreen_settings"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/xml_selector_settingsbutton"
-        android:layout_marginBottom="15dp"/>
-
     <Button
         android:id="@+id/startscreen_play"
         android:layout_width="110dp"
         android:layout_height="110dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="38dp"
+        android:layout_centerInParent="true"
         android:background="@drawable/playershapes_ball"
         android:gravity="center"
         android:text="@string/start_screen_play"
@@ -31,8 +20,11 @@
         style="@style/GameButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/startscreen_play"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/startscreen_gain_90_ep"
+        android:layout_marginBottom="2dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="2dp"
         android:text="@string/start_screen_unlock_all_levels"
         android:visibility="visible"/>
 
@@ -42,8 +34,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_below="@+id/startscreen_play"
+        android:layout_below="@+id/startscreen_to_gl_test_screen"
+        android:layout_marginBottom="2dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="2dp"
         android:text="@string/start_screen_gain_90_ep"
         android:visibility="visible"/>
 
@@ -64,8 +58,10 @@
         style="@style/GameButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_margin="10dp"
         android:text="@string/start_screen_to_gl_test_screen"
         android:visibility="visible"/>
 
diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml
index 13ab716..8274e8c 100644
--- a/app/src/main/res/layout/topbar.xml
+++ b/app/src/main/res/layout/topbar.xml
@@ -3,7 +3,7 @@
     android:id="@+id/topbar_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#a600f9">
+    android:background="@color/topbar">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/topbar_levellayout"
@@ -72,9 +72,9 @@
         android:id="@+id/topbar_settings"
         android:layout_width="35dp"
         android:layout_height="35dp"
+        android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="10dp"
-        android:layout_alignParentEnd="true"
         android:background="@drawable/xml_selector_settingsbutton"/>
 
     <Button
@@ -83,8 +83,8 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_centerVertical="true"
-        android:layout_toLeftOf="@+id/topbar_settings"
         android:layout_marginRight="20dp"
+        android:layout_toLeftOf="@+id/topbar_settings"
         android:background="@drawable/xml_selector_toolshopbutton"/>
 
     <Button
@@ -92,9 +92,9 @@
         style="@style/GameButton"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_toLeftOf="@+id/topbar_toolshop"
         android:layout_centerVertical="true"
         android:layout_marginRight="20dp"
+        android:layout_toLeftOf="@+id/topbar_toolshop"
         android:background="@drawable/xml_selector_shapeshopbutton"/>
 
     <TextView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dd2dc44..38acd76 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,4 +20,5 @@
     <color name="background_levelup_message">#9d000000</color>
     <color name="background_short_menu">#5b000000</color>
     <color name="background_tutorial">#3d000000</color>
+    <color name="topbar">#cf664c</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 947b271..bdb5733 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -29,8 +29,8 @@
     <string name="short_menu_restart">Restart</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 (Yes! It\'s magic!)</string>
-    <string name="start_screen_gain_90_ep" translatable="false">Gain 90 ep (Nope! No magic at all!)</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="tool_upgrade_title_placeholder">Time (Lv12)</string>