diff --git a/ShootingStars/assets/Gui/Button/Button.xml b/ShootingStars/assets/Gui/Button/Button.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Button/Button.xml
rename to ShootingStars/assets/Gui/Button/Button.gui.xml
diff --git a/ShootingStars/assets/Gui/Button/button.png b/ShootingStars/assets/Gui/Button/button.png
deleted file mode 100644
index f3444f1..0000000
Binary files a/ShootingStars/assets/Gui/Button/button.png and /dev/null differ
diff --git a/ShootingStars/assets/Gui/Button/buttonTransparent.png b/ShootingStars/assets/Gui/Button/buttonTransparent.png
index 65f2f8c..a4db276 100644
Binary files a/ShootingStars/assets/Gui/Button/buttonTransparent.png and b/ShootingStars/assets/Gui/Button/buttonTransparent.png differ
diff --git a/ShootingStars/assets/Gui/Button/buttonTransparentHover.png b/ShootingStars/assets/Gui/Button/buttonTransparentHover.png
index 59fd7ba..8b5876b 100644
Binary files a/ShootingStars/assets/Gui/Button/buttonTransparentHover.png and b/ShootingStars/assets/Gui/Button/buttonTransparentHover.png differ
diff --git a/ShootingStars/assets/Gui/Indicator/Indicator.xml b/ShootingStars/assets/Gui/Indicator/Indicator.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Indicator/Indicator.xml
rename to ShootingStars/assets/Gui/Indicator/Indicator.gui.xml
diff --git a/ShootingStars/assets/Gui/Menu/Menu.xml b/ShootingStars/assets/Gui/Menu/Menu.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Menu/Menu.xml
rename to ShootingStars/assets/Gui/Menu/Menu.gui.xml
diff --git a/ShootingStars/assets/Gui/Scrolling/Scrolling.xml b/ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Scrolling/Scrolling.xml
rename to ShootingStars/assets/Gui/Scrolling/Scrolling.gui.xml
diff --git a/ShootingStars/assets/Gui/Window/Window.xml b/ShootingStars/assets/Gui/Window/Window.gui.xml
similarity index 100%
rename from ShootingStars/assets/Gui/Window/Window.xml
rename to ShootingStars/assets/Gui/Window/Window.gui.xml
diff --git a/ShootingStars/assets/Gui/style_map.xml b/ShootingStars/assets/Gui/style_map.gui.xml
similarity index 54%
rename from ShootingStars/assets/Gui/style_map.xml
rename to ShootingStars/assets/Gui/style_map.gui.xml
index 3d67f95..1a8adaf 100644
--- a/ShootingStars/assets/Gui/style_map.xml
+++ b/ShootingStars/assets/Gui/style_map.gui.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <root>
-    <style control="Button" path="Gui/Button/Button.xml" />        
-    <cursors path="tonegod/gui/style/def/Common/Cursors/Cursors.xml" />
-    <audio path="tonegod/gui/style/def/Common/Audio/Audio.xml" />
-    <style control="Font" path="tonegod/gui/style/def/Fonts/Fonts.xml" />
-    <style control="Common" path="tonegod/gui/style/def/Common/Common.xml" />
-    <style control="Scrolling" path="Gui/Scrolling/Scrolling.xml" />
-    <style control="Window" path="Gui/Window/Window.xml" />        
-    <style control="Dial" path="tonegod/gui/style/def/Dial/Dial.xml" />
-    <style control="Menu" path="Gui/Menu/Menu.xml" />
-    <style control="Label" path="tonegod/gui/style/def/Label/Label.xml" />
-    <style control="Slider" path="tonegod/gui/style/def/Slider/Slider.xml" />
-    <style control="Spinner" path="tonegod/gui/style/def/Spinner/Spinner.xml" />
-    <style control="TextField" path="tonegod/gui/style/def/TextField/TextField.xml" />
-    <style control="TabControl" path="tonegod/gui/style/def/Tabs/Tabs.xml" />
-    <style control="ChatBox" path="tonegod/gui/style/def/ChatBox/ChatBox.xml" />
-    <style control="Indicator" path="Gui/Indicator/Indicator.xml" />
-    <style control="ColorWheel" path="tonegod/gui/style/def/Common/Extras/ColorWheel.xml" />
+    <style control="Button" path="Gui/Button/Button.gui.xml" />        
+    <cursors path="tonegod/gui/style/def/Common/Cursors/Cursors.gui.xml" />
+    <audio path="tonegod/gui/style/def/Common/Audio/Audio.gui.xml" />
+    <style control="Font" path="tonegod/gui/style/def/Fonts/Fonts.gui.xml" />
+    <style control="Common" path="tonegod/gui/style/def/Common/Common.gui.xml" />
+    <style control="Scrolling" path="Gui/Scrolling/Scrolling.gui.xml" />
+    <style control="Window" path="Gui/Window/Window.gui.xml" />        
+    <style control="Dial" path="tonegod/gui/style/def/Dial/Dial.gui.xml" />
+    <style control="Menu" path="Gui/Menu/Menu.gui.xml" />
+    <style control="Label" path="tonegod/gui/style/def/Label/Label.gui.xml" />
+    <style control="Slider" path="tonegod/gui/style/def/Slider/Slider.gui.xml" />
+    <style control="Spinner" path="tonegod/gui/style/def/Spinner/Spinner.gui.xml" />
+    <style control="TextField" path="tonegod/gui/style/def/TextField/TextField.gui.xml" />
+    <style control="TabControl" path="tonegod/gui/style/def/Tabs/Tabs.gui.xml" />
+    <style control="ChatBox" path="tonegod/gui/style/def/ChatBox/ChatBox.gui.xml" />
+    <style control="Indicator" path="Gui/Indicator/Indicator.gui.xml" />
+    <style control="ColorWheel" path="tonegod/gui/style/def/Common/Extras/ColorWheel.gui.xml" />
 </root>
 
diff --git a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
index ad604bf..12b31c7 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/ShootingStars.java
@@ -69,7 +69,7 @@ public class ShootingStars extends SimpleApplication {
     @Override
     public void simpleInitApp() {
         //screen = new Screen(this);
-        screen = new Screen(this, "Gui/style_map.xml");
+        screen = new Screen(this, "Gui/style_map.gui.xml");
         
         registerTypes();
         initGUI();
@@ -106,8 +106,7 @@ public class ShootingStars extends SimpleApplication {
         container.registerType(StateManager.class, true);
         container.registerType(SQLiteConnector.class);
         container.registerType(ScoreComparator.class);
-        container.registerType(HighscoreManager.class, true);        
-        //container.registerType(Screen.class, true);
+        container.registerType(HighscoreManager.class, true);
         container.registerType(ScreenHelper.class, true);
         container.registerType(AudioDataManager.class, true);
         container.registerType(YTDownloader.class);
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
index a173c7a..d0a9013 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/GameGUI.java
@@ -16,8 +16,6 @@
  */
 package org.wyrez.shootingstars.gui;
 
-import com.jme3.asset.AssetManager;
-import com.jme3.font.BitmapFont;
 import com.jme3.input.event.MouseButtonEvent;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.Vector2f;
@@ -30,10 +28,8 @@ import org.wyrez.shootingstars.gui.listener.GameListener;
 import org.wyrez.shootingstars.helper.ScreenHelper;
 import tonegod.gui.controls.buttons.Button;
 import tonegod.gui.controls.extras.Indicator;
-import tonegod.gui.controls.lists.Dial;
 import tonegod.gui.controls.text.Label;
 import tonegod.gui.controls.windows.Panel;
-import tonegod.gui.controls.windows.Window;
 import tonegod.gui.core.Screen;
 
 /**
@@ -75,8 +71,8 @@ public class GameGUI extends Panel implements Gui{
         float startPointYMenu = screenHelper.calcY(200f);
 
         float labelFontSize = screenHelper.calcX(20f);
-
-        btnStart = new ButtonBase(screen, new Vector2f(startPointx, startPointy),
+        
+        btnStart = new ButtonBase(screen, new Vector2f(startPointx, startPointy), 
                 new Vector2f(screenHelper.calcX(200f), screenHelper.calcY(40f))) {
             @Override
             public void onButtonMouseLeftUp(MouseButtonEvent evt, boolean toggled) {
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
index cb794c2..8b5d44d 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/ButtonBase.java
@@ -22,6 +22,7 @@ import com.jme3.math.Vector2f;
 import com.jme3.math.Vector4f;
 import tonegod.gui.controls.buttons.Button;
 import tonegod.gui.controls.buttons.ButtonAdapter;
+import tonegod.gui.core.ElementManager;
 import tonegod.gui.core.Screen;
 
 /**
@@ -30,32 +31,32 @@ import tonegod.gui.core.Screen;
  */
 public class ButtonBase extends ButtonAdapter {
 
-    public ButtonBase(Screen screen, Vector2f position) {
+    public ButtonBase(ElementManager screen, Vector2f position) {
         super(screen, position);
         init();
     }
 
-    public ButtonBase(Screen screen, Vector2f position, Vector2f dimensions) {
+    public ButtonBase(ElementManager screen, Vector2f position, Vector2f dimensions) {
         super(screen, position, dimensions);
         init();
     }
 
-    public ButtonBase(Screen screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
+    public ButtonBase(ElementManager screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
         super(screen, position, dimensions, resizeBorders, defaultImg);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position) {
         super(screen, UID, position);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position, Vector2f dimensions) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions) {
         super(screen, UID, position, dimensions);
         init();
     }
 
-    public ButtonBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
+    public ButtonBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg) {
         super(screen, UID, position, dimensions, resizeBorders, defaultImg);
         init();
     }
diff --git a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
index 8fcb69d..1a7a731 100644
--- a/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
+++ b/ShootingStars/src/org/wyrez/shootingstars/gui/controls/IndicatorBase.java
@@ -19,6 +19,7 @@ package org.wyrez.shootingstars.gui.controls;
 import com.jme3.math.Vector2f;
 import com.jme3.math.Vector4f;
 import tonegod.gui.controls.extras.Indicator;
+import tonegod.gui.core.ElementManager;
 import tonegod.gui.core.Screen;
 
 /**
@@ -27,32 +28,32 @@ import tonegod.gui.core.Screen;
  */
 public class IndicatorBase extends Indicator {
 
-    public IndicatorBase(Screen screen, Vector2f position, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Orientation orientation) {
         super(screen, position, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, Vector2f position, Vector2f dimensions, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Vector2f dimensions, Orientation orientation) {
         super(screen, position, dimensions, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
         super(screen, position, dimensions, resizeBorders, defaultImg, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Orientation orientation) {
         super(screen, UID, position, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Orientation orientation) {
         super(screen, UID, position, dimensions, orientation);
         init();
     }
 
-    public IndicatorBase(Screen screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
+    public IndicatorBase(ElementManager screen, String UID, Vector2f position, Vector2f dimensions, Vector4f resizeBorders, String defaultImg, Orientation orientation) {
         super(screen, UID, position, dimensions, resizeBorders, defaultImg, orientation);
         init();
     }