diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
index 507236d..d2765db 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
@@ -17,7 +17,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
@@ -107,7 +106,6 @@ public class EinstellungenFragment extends Fragment {
         theme1.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Toast.makeText(getContext(), "Theme1", Toast.LENGTH_SHORT).show();
                 SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit();
                 editor.putString("Theme", "RED_BLUE");
                 editor.apply();
@@ -121,7 +119,6 @@ public class EinstellungenFragment extends Fragment {
         theme2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Toast.makeText(getContext(), "Theme2", Toast.LENGTH_SHORT).show();
                 SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit();
                 editor.putString("Theme", "GREEN_YELLOW");
                 editor.apply();
@@ -135,7 +132,6 @@ public class EinstellungenFragment extends Fragment {
         theme3.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Toast.makeText(getContext(), "Theme3", Toast.LENGTH_SHORT).show();
                 SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit();
                 editor.putString("Theme", "ORANGE_TURQUOISE");
                 editor.apply();
@@ -149,7 +145,6 @@ public class EinstellungenFragment extends Fragment {
         theme4.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Toast.makeText(getContext(), "Theme4", Toast.LENGTH_SHORT).show();
                 SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit();
                 editor.putString("Theme", "YELLOW_BLUE");
                 editor.apply();
@@ -163,7 +158,6 @@ public class EinstellungenFragment extends Fragment {
         theme5.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Toast.makeText(getContext(), "Theme5", Toast.LENGTH_SHORT).show();
                 SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit();
                 editor.putString("Theme", "PINK_GREEN");
                 editor.apply();
@@ -214,7 +208,6 @@ public class EinstellungenFragment extends Fragment {
             public void onClick(DialogInterface dialogInterface, int i) {
                 if (i == 0) {
                     try {
-                        Toast.makeText(getContext(), "Colorpicker", Toast.LENGTH_SHORT).show();
                         final ColorPickerView picker = new ColorPickerView(getContext());
                         picker.setColor(0xff12345);
                         AlertDialog mDialog = new AlertDialog.Builder(getContext()).setView(picker).setTitle(R.string.colorpicker).setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@@ -229,7 +222,6 @@ public class EinstellungenFragment extends Fragment {
                     }
                 } else if (i == 1) {
                     try {
-                        Toast.makeText(getContext(), "Colorpicker", Toast.LENGTH_SHORT).show();
                         final ColorPickerView picker = new ColorPickerView(getContext());
                         picker.setColor(0xff12345);
                         AlertDialog mDialog = new AlertDialog.Builder(getContext()).setView(picker).setTitle(R.string.colorpicker).setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java
index 0f7c63d..1274b5d 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java
@@ -60,7 +60,6 @@ public class IntroFragment extends Fragment {
                 } else {
                     videoBG.setScaleY(1f / scaleX);
                 }
-                System.out.println("VIDEOOOOO");
                 mMediaPlayer = mediaPlayer;
                 // We want our video to play over and over so we set looping to true.
                 mMediaPlayer.setLooping(true);
diff --git a/app/src/main/res/drawable/graphite_logo.xml b/app/src/main/res/drawable/graphite_logo.xml
new file mode 100644
index 0000000..7625f43
--- /dev/null
+++ b/app/src/main/res/drawable/graphite_logo.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="500dp"
+    android:height="500dp"
+    android:viewportWidth="500"
+    android:viewportHeight="500">
+  <path
+      android:pathData="M226.1,71.6c-32.6,4.7 -63.8,18.5 -89.6,39.4 -10.3,8.4 -26,25.2 -33.7,36 -6.2,8.7 -20.8,35.7 -20.8,38.3 0,0.6 2,-2.4 4.5,-6.7 6.7,-11.8 14.7,-22 25.9,-33.1 25.7,-25.6 56.6,-40.5 95.3,-46.1 10.2,-1.5 22.3,-1.8 90.3,-1.9 68.4,-0.2 79.5,-0.4 86.6,-1.9 20.8,-4.2 35.9,-12.1 43.4,-22.7l2.1,-2.9 -97.3,0.1c-76.8,0.1 -99.3,0.4 -106.7,1.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M219,131.5c-39.7,5.8 -69.8,21.5 -91.6,47.6 -23.8,28.6 -38.3,65.4 -46.3,117.5l-1.8,11.6 3.2,8.3c20.5,52.3 67.1,93.5 121.5,107.6 36.1,9.4 73.7,7.6 108,-5.1 47.9,-17.8 86.2,-55.5 105.3,-103.5 10.7,-26.8 15.8,-65.8 11.2,-84 -3.9,-15.1 -16.1,-30.8 -29.4,-37.4 -13.8,-7 -15,-7.1 -78,-7.1 -45.9,-0 -57.9,0.3 -63.6,1.5 -24.7,5.2 -44.6,27.1 -47.1,52l-0.7,6.5 80.2,-0 80.1,-0 0,3.3c0,5.6 -2.9,26.9 -4.5,33.1 -8.7,33.1 -37.6,65.1 -70.7,78.2 -19.5,7.7 -44.2,10.4 -64.1,7 -28.2,-4.8 -51.8,-18 -71.2,-39.7 -28.6,-32 -37.3,-79.6 -22.2,-120.4 14.5,-39.2 50.8,-69.3 92.7,-76.9 7.2,-1.3 7.3,-1.4 2.5,-1.4 -2.7,-0 -8.8,0.6 -13.5,1.3z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/drawable/sidemenu.xml b/app/src/main/res/drawable/sidemenu.xml
index 22f7ff5..de8bbf2 100644
--- a/app/src/main/res/drawable/sidemenu.xml
+++ b/app/src/main/res/drawable/sidemenu.xml
@@ -11,16 +11,16 @@
                 android:startColor="?attr/colorSecondary" />
             <corners
                 android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="20dp"
+                android:bottomRightRadius="0dp"
                 android:topLeftRadius="0dp"
-                android:topRightRadius="20dp" />
+                android:topRightRadius="0dp" />
         </shape>
     </item>
     <item
-        android:bottom="2dp"
+        android:bottom="0dp"
         android:left="0dp"
         android:right="2dp"
-        android:top="2dp">
+        android:top="0dp">
         <shape xmlns:android="http://schemas.android.com/apk/res/android">
             <stroke
                 android:width="0dp"
@@ -31,9 +31,9 @@
                 android:startColor="?attr/colorOnBackground" />
             <corners
                 android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="20dp"
+                android:bottomRightRadius="0dp"
                 android:topLeftRadius="0dp"
-                android:topRightRadius="20dp" />
+                android:topRightRadius="0dp" />
         </shape>
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/teraplex_logo.xml b/app/src/main/res/drawable/teraplex_logo.xml
new file mode 100644
index 0000000..fae2fc0
--- /dev/null
+++ b/app/src/main/res/drawable/teraplex_logo.xml
@@ -0,0 +1,58 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="750dp"
+    android:height="250dp"
+    android:viewportWidth="750"
+    android:viewportHeight="250">
+  <path
+      android:pathData="M322.3,24.3c-1.8,2.9 -3.3,5.8 -3.3,6.4 0,0.7 -0.4,1.3 -0.9,1.3 -0.5,-0 -1.4,1.2 -2,2.7 -1.1,3 -5.2,10.5 -6.2,11.3 -1,0.8 -6.8,11.2 -8.6,15.2 -0.9,2.1 -2,3.8 -2.4,3.8 -0.4,-0 -1.3,1.6 -1.9,3.5 -0.6,1.9 -1.5,3.5 -2,3.5 -0.4,-0 -1.3,1.5 -2.1,3.2 -0.7,1.8 -2.7,5.5 -4.4,8.3 -3.9,6.2 -10,16.5 -10.9,18.5 -0.4,0.8 -2,3.7 -3.6,6.5 -1.7,2.7 -3.3,5.8 -3.6,6.7 -0.4,1 -1.1,1.8 -1.6,1.8 -0.5,-0 -0.8,0.6 -0.5,1.2 0.3,1 9.3,1.3 40.5,1.3 22.1,-0 40.2,-0.3 40.2,-0.8 0,-0.7 -2.4,-4.9 -5.7,-10.2 -0.7,-1.1 -2.2,-3.6 -3.2,-5.6l-2,-3.6 -17.6,0.2c-9.6,0.1 -17.5,-0.1 -17.5,-0.4 0,-0.4 0.5,-1.2 1,-1.7 1.2,-1.2 4.2,-6.2 6.8,-11.4 0.9,-1.9 2,-3.6 2.4,-3.8 0.4,-0.2 1.2,-1.9 1.8,-3.8 0.6,-1.9 1.6,-3.4 2.1,-3.4 0.5,-0 0.9,-0.4 0.9,-0.9 0,-1.4 7.1,-13.1 7.9,-13.1 0.4,-0 1.7,2.2 3,4.9 1.2,2.8 3.3,6.5 4.6,8.4 1.2,1.9 2.6,4.4 3,5.6 0.3,1.2 1.1,2.1 1.6,2.1 0.5,-0 0.9,0.6 0.9,1.3 0,0.8 1.7,4.1 3.9,7.4 2.1,3.3 4.2,7 4.6,8.2 0.3,1.1 1,2.1 1.5,2.1 0.4,-0 1.3,1.2 1.9,2.7 0.6,1.6 2.2,4.6 3.5,6.8 1.4,2.2 3.8,6.5 5.5,9.5 1.7,3 4.4,7.7 6.1,10.5 1.6,2.7 3.5,6.1 4,7.5 0.6,1.3 1.4,2.7 1.8,3 1,0.7 2.9,3.9 5.2,8.5 1.1,2.2 2.5,4.9 3.2,6 0.7,1.1 2.7,4.3 4.5,7.2 1.8,2.8 5.2,8.6 7.5,13 2.3,4.3 4.5,8 4.8,8.3 0.4,0.3 2.8,4.5 5.4,9.4 2.6,4.9 5.6,10 6.7,11.4 1,1.4 1.9,3.1 1.9,3.8 0,0.8 0.4,1.4 0.9,1.4 0.5,-0 1.4,1.2 2,2.7 0.6,1.6 2,4.1 3,5.8 1.1,1.6 2.9,4.9 4.1,7.3 2.4,4.7 3.4,4.6 5.5,-0.4 0.8,-2 2.8,-5.6 4.5,-8 1.6,-2.5 3,-4.9 3,-5.4 0,-0.5 0.6,-1.5 1.3,-2.2 1.5,-1.7 3.5,-5.1 6,-10.3 1.1,-2.2 2.2,-4.2 2.6,-4.5 0.3,-0.3 1.3,-1.9 2.1,-3.5 1.3,-2.6 2.8,-5.2 8.8,-15 0.7,-1.1 1.8,-3.1 2.4,-4.5 0.7,-1.4 3.1,-5.5 5.4,-9.1 2.3,-3.6 4.4,-7.4 4.8,-8.5 0.3,-1 2.2,-4.3 4.1,-7.2 1.9,-3 3.5,-5.7 3.5,-6 0,-0.4 1.4,-2.7 3,-5.2 1.6,-2.5 3,-5 3,-5.5 0,-0.8 -12.4,-1 -39.2,-0.9 -21.6,0.1 -39.9,0.2 -40.5,0.3 -1.6,0.1 -0.2,3.6 4.3,10.6 1.8,2.7 3.8,6.2 4.4,7.6l1.2,2.6 17.3,-0.1 17.3,-0.2 -2,4c-1.1,2.3 -2.4,4.3 -2.8,4.6 -0.4,0.3 -1,1.5 -1.4,2.7 -0.4,1.3 -1.3,2.9 -2,3.5 -0.6,0.7 -2.6,3.8 -4.2,6.8 -8.8,15.8 -9.2,16.4 -11.1,14.5 -0.7,-0.8 -2.8,-4.2 -4.6,-7.7 -4.2,-8.1 -6,-11.2 -6.8,-11.8 -0.4,-0.3 -1.8,-2.8 -3.3,-5.5 -1.4,-2.8 -3.1,-5.7 -3.6,-6.5 -0.5,-0.8 -2.9,-4.9 -5.1,-9 -2.3,-4.1 -4.5,-7.7 -4.9,-8 -0.3,-0.3 -1.3,-1.9 -2.2,-3.5 -2.7,-5.3 -5.3,-10 -5.9,-10.5 -0.3,-0.3 -1.8,-3 -3.3,-6 -1.6,-3 -3.1,-5.7 -3.5,-6 -0.3,-0.3 -1.4,-2.1 -2.4,-4 -3.9,-7.7 -5,-9.5 -5.9,-9.8 -0.4,-0.2 -0.8,-0.9 -0.8,-1.6 0,-0.8 -0.8,-2.4 -1.9,-3.7 -1,-1.3 -3.4,-5.3 -5.3,-8.9 -1.9,-3.6 -4.6,-8.3 -6,-10.5 -1.4,-2.2 -2.8,-5 -3.2,-6.3 -0.4,-1.2 -1.1,-2.2 -1.6,-2.2 -0.4,-0 -1.3,-1.2 -1.9,-2.8 -1.1,-2.9 -4.2,-8.4 -5.2,-9.2 -0.4,-0.3 -0.9,-1.4 -1.3,-2.5 -0.3,-1.1 -2.6,-5.1 -5.1,-9 -2.5,-3.8 -4.5,-7.5 -4.5,-8.2 0,-0.7 -0.4,-1.3 -0.8,-1.3 -0.4,-0 -2.1,-2.7 -3.6,-6 -1.6,-3.4 -3.2,-6.2 -3.5,-6.4 -0.3,-0.2 -2.1,1.9 -3.8,4.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M337,20.8c0,0.7 1.1,3 2.5,5 1.4,2 2.5,4.2 2.5,4.9 0,0.7 0.4,1.3 0.8,1.3 0.4,-0 1.3,1.2 1.9,2.7 0.7,1.6 2.6,5 4.2,7.8 1.7,2.7 3.3,5.7 3.7,6.5 0.5,0.8 2.3,3.8 4.1,6.7 1.8,2.9 3.3,5.5 3.3,5.9 0,0.6 6.3,11.5 10.1,17.4 0.5,0.8 1.2,2.3 1.5,3.2 0.4,1 1,1.8 1.4,1.8 0.4,-0 1,0.8 1.3,1.7 0.4,1 2.2,4.5 4.1,7.8 2,3.3 4,7.2 4.7,8.7 0.6,1.6 1.5,2.8 1.9,2.8 0.4,-0 1.3,1.2 1.9,2.7 1.2,3.4 4.1,8.2 6,10.3 1.2,1.2 5.8,1.5 30.3,1.5 16.5,0.1 28.8,-0.3 28.8,-0.8 0,-0.5 -1.3,-2.8 -2.8,-5.1 -1.5,-2.2 -3.1,-4.8 -3.5,-5.6 -0.5,-0.8 -1.6,-3.1 -2.6,-5l-1.9,-3.5 -17.7,-0.1c-9.7,-0.1 -17.7,-0.3 -17.9,-0.5 -0.1,-0.2 -3.3,-5.6 -7,-11.9 -3.6,-6.3 -7.1,-12.2 -7.6,-13 -0.5,-0.8 -1.7,-2.9 -2.5,-4.5 -0.8,-1.7 -2.4,-4.4 -3.5,-6 -1.1,-1.7 -2.3,-3.7 -2.6,-4.5 -0.4,-0.8 -1.3,-2.2 -1.9,-3 -0.7,-0.8 -3.4,-5.6 -6,-10.5 -2.6,-5 -5.1,-9.2 -5.6,-9.3 -0.5,-0.2 -0.9,-0.9 -0.9,-1.5 -0.1,-0.7 -2,-4.4 -4.3,-8.2l-4.2,-7 -11.2,-0.1c-8.9,-0 -11.3,0.3 -11.3,1.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M4.7,100.7c-0.4,0.3 -0.7,2.4 -0.7,4.5l0,3.8 11,-0 11,-0 0,19.5 0,19.5 5.5,-0 5.5,-0 0,-19.5 0,-19.4 10.8,-0.3 10.7,-0.3 0,-4 0,-4 -26.6,-0.3c-14.6,-0.1 -26.8,0.1 -27.2,0.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M72,124l0,24 24.3,-0.2 24.2,-0.3 0.3,-4.3 0.3,-4.2 -19,-0 -19.1,-0 0,-6 0,-6 11,-0 11,-0 0,-4 0,-4 -11,-0 -11,-0 0,-5 0,-5 18.5,-0 18.5,-0 0,-4.5 0,-4.5 -24,-0 -24,-0 0,24z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M141,124.1l0,24 5.3,-0.3 5.2,-0.3 0.3,-8.8 0.3,-8.7 5,-0c5,-0 5.2,0.1 14.7,9l9.6,9 7.4,-0c8.9,-0 9,0.3 -4,-10.2l-9,-7.3 5.7,-0.6c8.9,-1 10,-2.7 10,-14.9 0,-11.3 -0.7,-12.6 -7.1,-14 -2.1,-0.5 -12.8,-1 -23.6,-1l-19.8,-0 0,24.1zM180.8,114.5c0.5,7.1 -0.5,7.5 -16,7.5l-12.8,-0 0,-6.5 0,-6.6 14.3,0.3 14.2,0.3 0.3,5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M226.6,103.7c-3.2,5.1 -24.6,43.1 -24.6,43.8 0,0.3 2.4,0.5 5.3,0.3 5.2,-0.3 5.2,-0.3 8,-5.6l2.8,-5.2 14.9,-0 14.9,-0 2.8,5.2 2.8,5.3 5.8,0.3c3.5,0.2 5.7,-0.1 5.7,-0.8 0,-0.5 -5.9,-11.4 -13.1,-24l-13.2,-23 -4.8,-0c-4.5,-0 -5,0.3 -7.3,3.7zM242.7,128.7c-0.3,0.2 -4.8,0.2 -10,0.1l-9.6,-0.3 5,-9.4 5.1,-9.3 5,9.2c2.7,5.1 4.7,9.4 4.5,9.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M493,123.9l0,24.1 5.5,-0 5.5,-0 0,-9.5 0,-9.5 17.5,-0c17.3,-0 17.6,-0 20,-2.5 2.3,-2.2 2.5,-3.2 2.5,-11.4 0,-8.1 -0.2,-9.3 -2.4,-11.8l-2.4,-2.8 -23.1,-0.3 -23.1,-0.4 0,24.1zM532.5,115l0,5.5 -14.2,0.3 -14.3,0.3 0,-6.1 0,-6.1 14.3,0.3 14.2,0.3 0,5.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M561,123.9l0,24.1 23,-0 23,-0 0,-4.5 0,-4.5 -17.5,-0 -17.5,-0 -0.2,-19.3 -0.3,-19.2 -5.2,-0.3 -5.3,-0.3 0,24z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M623.7,100.7c-0.4,0.3 -0.7,11.1 -0.7,24l0,23.3 24.5,-0 24.5,-0 0,-4.5 0,-4.5 -19,-0 -19,-0 0,-6 0,-6 11,-0 11,-0 0,-4 0,-4 -11,-0 -11,-0 0,-5 0,-5 18.5,-0 18.5,-0 0,-4.5 0,-4.5 -23.3,-0c-12.9,-0 -23.7,0.3 -24,0.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M685,100.7c0,0.4 4.9,5.7 11,11.8l11,11 -11,12 -11,12 6.2,0.3 6.2,0.3 5.1,-5.8c2.7,-3.2 6.4,-7.4 8.2,-9.3l3.2,-3.5 8.6,9.2 8.7,9.3 6.9,-0c3.8,-0 6.9,-0.3 6.9,-0.7 0,-0.4 -5.5,-6.3 -12.1,-12.9l-12.2,-12.2 9.4,-10.1c5.2,-5.6 9.6,-10.6 9.7,-11.1 0.2,-0.6 -2,-1 -5.1,-1 -5.4,-0 -5.7,0.2 -10.5,5.2 -2.7,2.9 -6.1,6.6 -7.5,8.3l-2.6,3 -7.6,-8.3 -7.7,-8.2 -6.9,-0c-3.8,-0 -6.9,0.3 -6.9,0.7z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M297,129.9c0,0.2 2.5,4.5 5.5,9.6 3,5 5.5,9.6 5.5,10.2 0,0.6 6.4,1 18,0.9l18,-0.2 1.3,2.8c0.6,1.6 1.5,2.8 1.9,2.8 0.3,-0 1.2,1.6 1.8,3.5 0.6,1.9 1.5,3.5 2,3.5 0.5,-0 1.4,1.6 2.1,3.5 0.7,1.9 1.6,3.5 2,3.5 0.4,-0 1.2,1.2 1.8,2.7 1.8,4.2 4.3,8.6 5.8,10.1 0.7,0.7 1.3,2 1.3,2.8 0,0.8 0.4,1.4 0.9,1.4 0.5,-0 1.5,1.5 2.2,3.2 0.7,1.8 2.5,5.1 3.9,7.3 4.1,6.5 4.7,7.6 8.7,15.3 2,4 4.3,7.8 5,8.4 0.7,0.6 1.3,1.7 1.3,2.4 0,0.8 0.4,1.4 1,1.4 0.5,-0 1.2,1.1 1.6,2.5 0.4,1.5 1.5,2.7 2.8,3 3.2,0.7 21.3,0.1 22.2,-0.8 0.4,-0.4 0.3,-0.7 -0.3,-0.7 -0.6,-0 -1.8,-1.7 -2.8,-3.8 -2.3,-5.2 -4.7,-9.6 -5.5,-10.2 -1.1,-0.8 -10,-16.8 -10,-18 0,-0.5 -0.4,-1 -0.8,-1 -0.5,-0 -2.1,-2.6 -3.7,-5.8 -1.5,-3.1 -3.1,-5.9 -3.4,-6.2 -0.4,-0.3 -1.2,-1.6 -1.8,-3 -0.7,-1.4 -2.4,-4.3 -3.7,-6.5 -2.3,-3.7 -7.5,-12.6 -11.8,-20.3 -4.5,-8 -5.8,-10.3 -8.1,-13.9 -1.3,-2.1 -3.1,-5.4 -4,-7.3l-1.7,-3.5 -29.5,-0c-16.2,-0 -29.5,0.2 -29.5,0.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M63,167.5l0,2.5 136,-0 136,-0 0,-2.5 0,-2.5 -136,-0 -136,-0 0,2.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M478,167.5l0,2.5 104.5,-0 104.5,-0 0,-2.5 0,-2.5 -104.5,-0 -104.5,-0 0,2.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 2d8660e..f1d39e3 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,14 +11,14 @@
     <include
         layout="@layout/app_bar_main"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <com.google.android.material.navigation.NavigationView
         android:id="@+id/nav_view"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:layout_marginTop="76dp"
+        android:layout_marginTop="25dp"
         android:background="@drawable/sidemenu"
         android:fitsSystemWindows="true"
         android:scaleType="centerCrop"
@@ -26,5 +26,6 @@
         app:itemIconTint="@color/mtrl_btn_text_color_selector"
         app:itemTextColor="@color/mtrl_btn_text_color_selector"
         app:menu="@menu/activity_main_drawer" />
+
 </androidx.drawerlayout.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f03a3ee..13f8299 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -18,19 +18,19 @@
         android:id="@+id/include"
         layout="@layout/content_main" />
 
-        <de.jg_cody.Teraplex.MovableFloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"/>
+    <de.jg_cody.Teraplex.MovableFloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:layout_anchorGravity="center"
-            app:popupTheme="@style/Theme.red_blue.PopupOverlay" />
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:layout_anchorGravity="center"
+        app:popupTheme="@style/Theme.red_blue.PopupOverlay" />
 
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml
index 08b0336..f7ad73b 100644
--- a/app/src/main/res/layout/fragment_credits.xml
+++ b/app/src/main/res/layout/fragment_credits.xml
@@ -73,7 +73,8 @@
                 app:drawableTint="@color/mtrl_btn_text_color_selector"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/lizenz" />
+                app:layout_constraintTop_toBottomOf="@+id/lizenz"
+                android:drawableLeft="@drawable/copyright_black_24dp" />
 
             <TextView
                 android:id="@+id/programmcode"
@@ -242,7 +243,8 @@
                 android:id="@+id/imageView3"
                 android:layout_width="130dp"
                 android:layout_height="50dp"
-                android:src="@drawable/jg_cody_white"
+                android:src="@drawable/teraplex_logo"
+                app:tint="@color/mtrl_btn_text_color_selector"
                 app:layout_constraintEnd_toEndOf="@+id/team"
                 app:layout_constraintStart_toStartOf="@+id/team"
                 app:layout_constraintTop_toBottomOf="@+id/julianG" />
@@ -251,10 +253,11 @@
                 android:id="@+id/imageView5"
                 android:layout_width="130dp"
                 android:layout_height="50dp"
-                android:src="@drawable/graphite_raw"
+                android:src="@drawable/graphite_logo"
                 app:layout_constraintEnd_toEndOf="@+id/supporter1"
                 app:layout_constraintStart_toStartOf="@+id/supporter1"
-                app:layout_constraintTop_toBottomOf="@+id/supporter1" />
+                app:layout_constraintTop_toBottomOf="@+id/supporter1"
+                app:tint="@color/mtrl_btn_text_color_selector" />
 
             <View
                 android:id="@+id/divider5"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 181023d..0f536d1 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -19,19 +19,22 @@
         android:layout_height="80dp"
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@drawable/logo_teraplex_ausgeschrieben_alpha_und_weis" />
+        android:src="@drawable/teraplex_logo"
+        app:tint="@color/mtrl_btn_text_color_selector"/>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="@string/ssh_remote"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textColor="@color/mtrl_btn_text_color_selector" />
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="www.jg-cody.de" />
+        android:text="www.jg-cody.de"
+        android:textColor="@color/mtrl_btn_text_color_selector" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/only_color.xml b/app/src/main/res/layout/only_color.xml
new file mode 100644
index 0000000..27ac52a
--- /dev/null
+++ b/app/src/main/res/layout/only_color.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:foreground="@drawable/background_full">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 7606d0c..26e60e4 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,4 +1,4 @@
-<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Theme.red_blue" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
@@ -19,9 +19,11 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
         <item name="colorControlActivated">@color/red</item>
-
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
+        <item name="android:actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
     </style>
 
+
     <style name="Theme.red_blue.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -44,6 +46,10 @@
         <item name="android:background">@color/white</item>
     </style>
 
+    <style name="ActionPopupMenuStyle" parent="Widget.AppCompat.PopupMenu">
+        <item name="android:popupBackground">@drawable/button_round</item>
+    </style>
+
     <style name="Theme.orange_turquoise.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -89,6 +95,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
         <item name="colorControlActivated">@color/green</item>
     </style>
 
@@ -110,6 +117,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
         <item name="colorControlActivated">@color/orange</item>
     </style>
 
@@ -131,6 +139,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
         <item name="colorControlActivated">@color/yellow</item>
     </style>
 
@@ -152,6 +161,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
         <item name="colorControlActivated">@color/pink</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index e5f0af1..2d3c191 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -17,8 +17,12 @@
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-        <item name="android:itemBackground">@drawable/button_round</item>
+        <!-- Customize your theme here.-->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
+    </style>
+
+    <style name="ActionPopupMenuStyle" parent="Widget.AppCompat.PopupMenu">
+           <item name="android:popupBackground">@drawable/button_round</item>
     </style>
 
     <style name="Theme.red_blue.NoActionBar">
@@ -39,39 +43,39 @@
 
     <style name="Theme.green_yellow.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="PopupMenuStyle" parent="Theme.AppCompat.Light">
-        <item name="android:background">@color/white</item>
-    </style>
+    <!--  <style name="PopupMenuStyle" parent="Theme.AppCompat.Light">
+               <item name="android:background">@color/white</item>
+        </style>-->
 
-    <style name="Theme.orange_turquoise.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+        <style name="Theme.orange_turquoise.NoActionBar">
+            <item name="windowActionBar">false</item>
+            <item name="windowNoTitle">true</item>
+        </style>
 
-    <style name="Theme.orange_turquoise.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+        <style name="Theme.orange_turquoise.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="Theme.orange_turquoise.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+        <style name="Theme.orange_turquoise.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="Theme.yellow_blue.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+        <style name="Theme.yellow_blue.NoActionBar">
+            <item name="windowActionBar">false</item>
+            <item name="windowNoTitle">true</item>
+        </style>
 
-    <style name="Theme.yellow_blue.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+        <style name="Theme.yellow_blue.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="Theme.yellow_blue.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+        <style name="Theme.yellow_blue.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="Theme.pink_green.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+        <style name="Theme.pink_green.NoActionBar">
+            <item name="windowActionBar">false</item>
+            <item name="windowNoTitle">true</item>
+        </style>
 
-    <style name="Theme.pink_green.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+        <style name="Theme.pink_green.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-    <style name="Theme.pink_green.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+        <style name="Theme.pink_green.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="Theme.green_yellow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
+        <style name="Theme.green_yellow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+            <!-- Primary brand color. -->
         <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
         <item name="android:windowTranslucentNavigation" tools:targetApi="kitkat">true</item>
         <item name="windowActionBar">false</item>
@@ -88,6 +92,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
     </style>
 
     <style name="Theme.orange_turquoise" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -108,6 +113,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
     </style>
 
     <style name="Theme.yellow_blue" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -128,6 +134,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
     </style>
 
     <style name="Theme.pink_green" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
@@ -148,6 +155,7 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
+        <item name="actionOverflowMenuStyle">@style/ActionPopupMenuStyle</item>
     </style>
     
 </resources>
\ No newline at end of file