diff --git a/DBTApp/.gitignore b/DBTApp/.gitignore
index cecb4de..aa724b7 100644
--- a/DBTApp/.gitignore
+++ b/DBTApp/.gitignore
@@ -1,5 +1,3 @@
-# Android studio
-
 *.iml
 .gradle
 /local.properties
@@ -15,174 +13,3 @@
 .externalNativeBuild
 .cxx
 local.properties
-
-# Android
-
-# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio
-# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio
-
-### Android ###
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Log/OS Files
-*.log
-
-# Android Studio generated files and folders
-captures/
-.externalNativeBuild/
-.cxx/
-*.apk
-output.json
-
-# IntelliJ
-*.iml
-.idea/
-misc.xml
-deploymentTargetDropDown.xml
-render.experimental.xml
-
-# Keystore files
-*.jks
-*.keystore
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Android Profiling
-*.hprof
-
-### Android Patch ###
-gen-external-apklibs
-
-# Replacement of .externalNativeBuild directories introduced
-# with Android Studio 3.5.
-
-### AndroidStudio ###
-# Covers files to be ignored for android development using Android Studio.
-
-# Built application files
-*.ap_
-*.aab
-
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle
-
-# Signing files
-.signing/
-
-# Local configuration file (sdk path, etc)
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-
-# Android Studio
-/*/build/
-/*/local.properties
-/*/out
-/*/*/build
-/*/*/production
-.navigation/
-*.ipr
-*~
-*.swp
-
-# Keystore files
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
-# Android Patch
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# NDK
-obj/
-
-# IntelliJ IDEA
-*.iws
-/out/
-
-# User-specific configurations
-.idea/caches/
-.idea/libraries/
-.idea/shelf/
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/.name
-.idea/compiler.xml
-.idea/copyright/profiles_settings.xml
-.idea/encodings.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/vcs.xml
-.idea/jsLibraryMappings.xml
-.idea/datasources.xml
-.idea/dataSources.ids
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
-.idea/assetWizardSettings.xml
-.idea/gradle.xml
-.idea/jarRepositories.xml
-.idea/navEditor.xml
-
-# Legacy Eclipse project files
-.classpath
-.project
-.cproject
-.settings/
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.ear
-
-# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
-hs_err_pid*
-
-## Plugin-specific files:
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Mongo Explorer plugin
-.idea/mongoSettings.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-### AndroidStudio Patch ###
-
-!/gradle/wrapper/gradle-wrapper.jar
-
-# End of https://www.toptal.com/developers/gitignore/api/android,androidstudio
-
diff --git a/DBTApp/.idea/.gitignore b/DBTApp/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/DBTApp/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/DBTApp/.idea/.name b/DBTApp/.idea/.name
deleted file mode 100644
index 8cb8797..0000000
--- a/DBTApp/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-DBT App
\ No newline at end of file
diff --git a/DBTApp/.idea/codeStyles/Project.xml b/DBTApp/.idea/codeStyles/Project.xml
deleted file mode 100644
index 7643783..0000000
--- a/DBTApp/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/DBTApp/.idea/codeStyles/codeStyleConfig.xml b/DBTApp/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123..0000000
--- a/DBTApp/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/DBTApp/.idea/deploymentTargetSelector.xml b/DBTApp/.idea/deploymentTargetSelector.xml
index 02663a9..b268ef3 100644
--- a/DBTApp/.idea/deploymentTargetSelector.xml
+++ b/DBTApp/.idea/deploymentTargetSelector.xml
@@ -5,12 +5,6 @@
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
       </SelectionState>
-      <SelectionState runConfigName="HomeActivity">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-      <SelectionState runConfigName="PreviewMessageCard">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
     </selectionStates>
   </component>
 </project>
\ No newline at end of file
diff --git a/DBTApp/.idea/gradle.xml b/DBTApp/.idea/gradle.xml
index 639c779..97f0a8e 100644
--- a/DBTApp/.idea/gradle.xml
+++ b/DBTApp/.idea/gradle.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/DBTApp/app/build.gradle.kts b/DBTApp/app/build.gradle.kts
index c0f101f..92a45c3 100644
--- a/DBTApp/app/build.gradle.kts
+++ b/DBTApp/app/build.gradle.kts
@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-    namespace = "de.cdaut.dbt"
+    namespace = "de.cdaut.dbtapp"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "de.cdaut.dbt"
+        applicationId = "de.cdaut.dbtapp"
         minSdk = 26
         targetSdk = 35
         versionCode = 1
@@ -35,7 +35,6 @@ android {
         jvmTarget = "11"
     }
     buildFeatures {
-        viewBinding = true
         compose = true
     }
 }
@@ -47,7 +46,7 @@ dependencies {
     androidTestImplementation(composeBom)
 
     // Material Design 3
-    implementation(libs.material3)
+    implementation(libs.androidx.material3)
 
     // Android Studio Preview support
     implementation(libs.androidx.ui.tooling.preview)
@@ -63,19 +62,12 @@ dependencies {
     implementation(libs.androidx.material.icons.core)
     // Optional - Add full set of material icons
     implementation(libs.androidx.material.icons.extended)
-
-    // Optional - Integration with activities
-    implementation(libs.androidx.activity.compose)
+    // Optional - Add window size utils
+    implementation(libs.androidx.adaptive)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
-    implementation(libs.androidx.constraintlayout)
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
-    implementation(libs.androidx.runtime.android)
-    implementation(libs.androidx.ui.tooling.preview.android)
-    implementation(libs.androidx.material3.android)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
diff --git a/DBTApp/app/src/androidTest/java/de/cdaut/dbt/ExampleInstrumentedTest.kt b/DBTApp/app/src/androidTest/java/de/cdaut/dbtapp/ExampleInstrumentedTest.kt
similarity index 86%
rename from DBTApp/app/src/androidTest/java/de/cdaut/dbt/ExampleInstrumentedTest.kt
rename to DBTApp/app/src/androidTest/java/de/cdaut/dbtapp/ExampleInstrumentedTest.kt
index 5242c37..2d65959 100644
--- a/DBTApp/app/src/androidTest/java/de/cdaut/dbt/ExampleInstrumentedTest.kt
+++ b/DBTApp/app/src/androidTest/java/de/cdaut/dbtapp/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package de.cdaut.dbt
+package de.cdaut.dbtapp
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("de.cdaut.dbt", appContext.packageName)
+        assertEquals("de.cdaut.dbtapp", appContext.packageName)
     }
 }
\ No newline at end of file
diff --git a/DBTApp/app/src/main/AndroidManifest.xml b/DBTApp/app/src/main/AndroidManifest.xml
index 9e9a126..c8854e3 100644
--- a/DBTApp/app/src/main/AndroidManifest.xml
+++ b/DBTApp/app/src/main/AndroidManifest.xml
@@ -11,18 +11,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DBTApp"
-        tools:targetApi="31">
-        <activity
-            android:name=".activities.HomeActivity"
-            android:exported="true"
-            android:theme="@style/Theme.DBTApp">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-    </application>
+        tools:targetApi="31" />
 
 </manifest>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/FavouritesFragment.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/FavouritesFragment.kt
deleted file mode 100644
index 8d86b3a..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/FavouritesFragment.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import de.cdaut.dbt.R
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [FavouritesFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class FavouritesFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_favourites, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment FavouritesFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            FavouritesFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeActivity.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeActivity.kt
deleted file mode 100644
index 12a8eba..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeActivity.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.navigation.NavigationBarView
-import de.cdaut.dbt.R
-import de.cdaut.dbt.databinding.ActivityHomeBinding
-
-
-class HomeActivity : AppCompatActivity() {
-
-    private lateinit var binding: ActivityHomeBinding
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        binding = ActivityHomeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-
-        val bottomNav = findViewById<BottomNavigationView>(R.id.bottom_navigation)
-        bottomNav.setSelectedItemId(R.id.home)
-
-        bottomNav.setOnItemSelectedListener { selectedItem ->
-            when (selectedItem.itemId){
-                R.id.home -> {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_container, HomeFragment()).commit()
-                    true
-                }
-                R.id.favs -> {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_container, FavouritesFragment()).commit()
-                    true
-                }
-                R.id.skilllist -> {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_container, SkillListFragment()).commit()
-                    true
-                }
-                R.id.skills_chains -> {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_container, SkillsChainsFragment()).commit()
-                    true
-                }
-                R.id.tracking -> {
-                    supportFragmentManager.beginTransaction()
-                        .replace(R.id.fragment_container, TrackingFragment()).commit()
-                    true
-                }
-                else -> false
-            }
-        }
-
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.fragment_container, HomeFragment()).commit()
-
-    }
-
-
-}
-
-
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeFragment.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeFragment.kt
deleted file mode 100644
index d32dc43..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/HomeFragment.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import de.cdaut.dbt.databinding.FragmentHomeBinding
-
-/**
- * A simple [Fragment] subclass as the default destination in the navigation.
- */
-class HomeFragment : Fragment() {
-
-private var _binding: FragmentHomeBinding? = null
-    // This property is only valid between onCreateView and
-    // onDestroyView.
-    private val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-
-      _binding = FragmentHomeBinding.inflate(inflater, container, false)
-      return binding.root
-
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillListFragment.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillListFragment.kt
deleted file mode 100644
index c06649b..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillListFragment.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import de.cdaut.dbt.R
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [SkillListFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class SkillListFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_skill_list, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment SkillListFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            SkillListFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillsChainsFragment.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillsChainsFragment.kt
deleted file mode 100644
index 27f32af..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/SkillsChainsFragment.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import de.cdaut.dbt.R
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [SkillsChainsFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class SkillsChainsFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_skills_chains, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment SkillsChainsFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            SkillsChainsFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/TrackingFragment.kt b/DBTApp/app/src/main/java/de/cdaut/dbt/activities/TrackingFragment.kt
deleted file mode 100644
index 2dd113b..0000000
--- a/DBTApp/app/src/main/java/de/cdaut/dbt/activities/TrackingFragment.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.cdaut.dbt.activities
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import de.cdaut.dbt.R
-
-// TODO: Rename parameter arguments, choose names that match
-// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-private const val ARG_PARAM1 = "param1"
-private const val ARG_PARAM2 = "param2"
-
-/**
- * A simple [Fragment] subclass.
- * Use the [TrackingFragment.newInstance] factory method to
- * create an instance of this fragment.
- */
-class TrackingFragment : Fragment() {
-    // TODO: Rename and change types of parameters
-    private var param1: String? = null
-    private var param2: String? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let {
-            param1 = it.getString(ARG_PARAM1)
-            param2 = it.getString(ARG_PARAM2)
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_tracking, container, false)
-    }
-
-    companion object {
-        /**
-         * Use this factory method to create a new instance of
-         * this fragment using the provided parameters.
-         *
-         * @param param1 Parameter 1.
-         * @param param2 Parameter 2.
-         * @return A new instance of fragment TrackingFragment.
-         */
-        // TODO: Rename and change types and number of parameters
-        @JvmStatic
-        fun newInstance(param1: String, param2: String) =
-            TrackingFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_PARAM1, param1)
-                    putString(ARG_PARAM2, param2)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/drawable/baseline_menu_book_24.xml b/DBTApp/app/src/main/res/drawable/baseline_menu_book_24.xml
deleted file mode 100644
index a30d9cb..0000000
--- a/DBTApp/app/src/main/res/drawable/baseline_menu_book_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M21,5c-1.11,-0.35 -2.33,-0.5 -3.5,-0.5c-1.95,0 -4.05,0.4 -5.5,1.5c-1.45,-1.1 -3.55,-1.5 -5.5,-1.5S2.45,4.9 1,6v14.65c0,0.25 0.25,0.5 0.5,0.5c0.1,0 0.15,-0.05 0.25,-0.05C3.1,20.45 5.05,20 6.5,20c1.95,0 4.05,0.4 5.5,1.5c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.65,0 3.35,0.3 4.75,1.05c0.1,0.05 0.15,0.05 0.25,0.05c0.25,0 0.5,-0.25 0.5,-0.5V6C22.4,5.55 21.75,5.25 21,5zM21,18.5c-1.1,-0.35 -2.3,-0.5 -3.5,-0.5c-1.7,0 -4.15,0.65 -5.5,1.5V8c1.35,-0.85 3.8,-1.5 5.5,-1.5c1.2,0 2.4,0.15 3.5,0.5V18.5z"/>
-      
-    <path android:fillColor="@android:color/white" android:pathData="M17.5,10.5c0.88,0 1.73,0.09 2.5,0.26V9.24C19.21,9.09 18.36,9 17.5,9c-1.7,0 -3.24,0.29 -4.5,0.83v1.66C14.13,10.85 15.7,10.5 17.5,10.5z"/>
-      
-    <path android:fillColor="@android:color/white" android:pathData="M13,12.49v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26V11.9c-0.79,-0.15 -1.64,-0.24 -2.5,-0.24C15.8,11.66 14.26,11.96 13,12.49z"/>
-      
-    <path android:fillColor="@android:color/white" android:pathData="M17.5,14.33c-1.7,0 -3.24,0.29 -4.5,0.83v1.66c1.13,-0.64 2.7,-0.99 4.5,-0.99c0.88,0 1.73,0.09 2.5,0.26v-1.52C19.21,14.41 18.36,14.33 17.5,14.33z"/>
-    
-</vector>
diff --git a/DBTApp/app/src/main/res/drawable/emergency_24px.xml b/DBTApp/app/src/main/res/drawable/emergency_24px.xml
deleted file mode 100644
index 1156fbe..0000000
--- a/DBTApp/app/src/main/res/drawable/emergency_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M410,840L410,602L204,721L134,600L340,480L134,361L204,240L410,359L410,120L550,120L550,359L756,240L826,361L620,480L826,600L756,721L550,602L550,840L410,840Z"/>
-</vector>
diff --git a/DBTApp/app/src/main/res/drawable/home_24px.xml b/DBTApp/app/src/main/res/drawable/home_24px.xml
deleted file mode 100644
index 16b0538..0000000
--- a/DBTApp/app/src/main/res/drawable/home_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M240,760L360,760L360,520L600,520L600,760L720,760L720,400L480,220L240,400L240,760ZM160,840L160,360L480,120L800,360L800,840L520,840L520,600L440,600L440,840L160,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/>
-</vector>
diff --git a/DBTApp/app/src/main/res/drawable/outline_calendar_month_24.xml b/DBTApp/app/src/main/res/drawable/outline_calendar_month_24.xml
deleted file mode 100644
index 23988d4..0000000
--- a/DBTApp/app/src/main/res/drawable/outline_calendar_month_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M19,4h-1V2h-2v2H8V2H6v2H5C3.89,4 3.01,4.9 3.01,6L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6C21,4.9 20.1,4 19,4zM19,20H5V10h14V20zM19,8H5V6h14V8zM9,14H7v-2h2V14zM13,14h-2v-2h2V14zM17,14h-2v-2h2V14zM9,18H7v-2h2V18zM13,18h-2v-2h2V18zM17,18h-2v-2h2V18z"/>
-    
-</vector>
diff --git a/DBTApp/app/src/main/res/drawable/sort_24px.xml b/DBTApp/app/src/main/res/drawable/sort_24px.xml
deleted file mode 100644
index 1f06ff7..0000000
--- a/DBTApp/app/src/main/res/drawable/sort_24px.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal"
-    android:autoMirrored="true">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M120,720L120,640L360,640L360,720L120,720ZM120,520L120,440L600,440L600,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z"/>
-</vector>
diff --git a/DBTApp/app/src/main/res/drawable/star_24px.xml b/DBTApp/app/src/main/res/drawable/star_24px.xml
deleted file mode 100644
index 0a592a4..0000000
--- a/DBTApp/app/src/main/res/drawable/star_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/>
-</vector>
diff --git a/DBTApp/app/src/main/res/layout/activity_home.xml b/DBTApp/app/src/main/res/layout/activity_home.xml
deleted file mode 100644
index 9619299..0000000
--- a/DBTApp/app/src/main/res/layout/activity_home.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context=".activities.HomeActivity">
-
-    <include layout="@layout/content_home" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/content_home.xml b/DBTApp/app/src/main/res/layout/content_home.xml
deleted file mode 100644
index 08d0418..0000000
--- a/DBTApp/app/src/main/res/layout/content_home.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:defaultNavHost="true"
-        app:navGraph="@navigation/nav_graph"
-        android:layout_above="@id/bottom_navigation"/>
-
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/bottom_navigation"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="bottom"
-        android:background="@android:color/background_dark"
-        app:itemIconTint="@android:color/white"
-        app:itemTextColor="@android:color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:menu="@menu/bottom_navbar" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/emergency_fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
-        android:clickable="true"
-        android:contentDescription="@string/emergency_button"
-        app:backgroundTint="#FF4545"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/emergency_24px" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/fragment_favourites.xml b/DBTApp/app/src/main/res/layout/fragment_favourites.xml
deleted file mode 100644
index 812e2f1..0000000
--- a/DBTApp/app/src/main/res/layout/fragment_favourites.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.FavouritesFragment">
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/favourites"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/fragment_home.xml b/DBTApp/app/src/main/res/layout/fragment_home.xml
deleted file mode 100644
index 329f50a..0000000
--- a/DBTApp/app/src/main/res/layout/fragment_home.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.FavouritesFragment">
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/home"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/fragment_skill_list.xml b/DBTApp/app/src/main/res/layout/fragment_skill_list.xml
deleted file mode 100644
index f19e3e0..0000000
--- a/DBTApp/app/src/main/res/layout/fragment_skill_list.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.FavouritesFragment">
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/skill_list"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/fragment_skills_chains.xml b/DBTApp/app/src/main/res/layout/fragment_skills_chains.xml
deleted file mode 100644
index 828eed2..0000000
--- a/DBTApp/app/src/main/res/layout/fragment_skills_chains.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.FavouritesFragment">
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/skills_chain"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/layout/fragment_tracking.xml b/DBTApp/app/src/main/res/layout/fragment_tracking.xml
deleted file mode 100644
index f1898ef..0000000
--- a/DBTApp/app/src/main/res/layout/fragment_tracking.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.FavouritesFragment">
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/tracking"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/menu/bottom_navbar.xml b/DBTApp/app/src/main/res/menu/bottom_navbar.xml
deleted file mode 100644
index c774168..0000000
--- a/DBTApp/app/src/main/res/menu/bottom_navbar.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/tracking"
-        android:icon="@drawable/outline_calendar_month_24"
-        android:title="@string/tracking" />
-    <item
-        android:id="@+id/skilllist"
-        android:icon="@drawable/baseline_menu_book_24"
-        android:title="@string/skill_list" />
-    <item
-        android:id="@+id/home"
-        android:icon="@drawable/home_24px"
-        android:title="@string/home" />
-    <item
-        android:id="@+id/favs"
-        android:icon="@drawable/star_24px"
-        android:title="@string/favourites" />
-    <item
-        android:id="@+id/skills_chains"
-        android:icon="@drawable/sort_24px"
-        android:title="@string/skills_chain" />
-</menu>
diff --git a/DBTApp/app/src/main/res/navigation/nav_graph.xml b/DBTApp/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index 63bc0af..0000000
--- a/DBTApp/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/nav_graph"
-    app:startDestination="@id/FirstFragment">
-
-    <fragment
-        android:id="@+id/FirstFragment"
-        android:name="de.cdaut.dbt.activities.HomeFragment"
-        android:label="@string/first_fragment_label"
-        tools:layout="@layout/fragment_home" />
-</navigation>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-de-rDE/strings.xml b/DBTApp/app/src/main/res/values-de-rDE/strings.xml
deleted file mode 100644
index 009312e..0000000
--- a/DBTApp/app/src/main/res/values-de-rDE/strings.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">DBT App</string>
-    <string name="first_fragment_label">Erstes Fragment</string>
-    <string name="tracking">Tracking</string>
-    <string name="skill_list">Skill Liste</string>
-    <string name="favourites">Favoriten</string>
-    <string name="home">Home</string>
-    <string name="skills_chain">Skillsketten</string>
-    <string name="hello_blank_fragment">Leeres Fragment</string>
-    <string name="emergency_button">Notfall</string>
-</resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-land/dimens.xml b/DBTApp/app/src/main/res/values-land/dimens.xml
deleted file mode 100644
index 10125a3..0000000
--- a/DBTApp/app/src/main/res/values-land/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-      <dimen name="fab_margin">48dp</dimen>
-   </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-night/themes.xml b/DBTApp/app/src/main/res/values-night/themes.xml
index f65506a..99159d7 100644
--- a/DBTApp/app/src/main/res/values-night/themes.xml
+++ b/DBTApp/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.DBTApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.DBTApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -13,9 +13,4 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-  <!-- Base application theme. -->
-    <style name="Base.Theme.DBTApp" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
-    </style>
 </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-v23/themes.xml b/DBTApp/app/src/main/res/values-v23/themes.xml
deleted file mode 100644
index 9f8c75d..0000000
--- a/DBTApp/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="Theme.DBTApp" parent="Base.Theme.DBTApp">
-    <!-- Transparent system bars for edge-to-edge. -->
-    <item name="android:navigationBarColor">@android:color/transparent</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-    <item name="android:windowLightStatusBar">?attr/isLightTheme</item>
-  </style>
-</resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-w1240dp/dimens.xml b/DBTApp/app/src/main/res/values-w1240dp/dimens.xml
deleted file mode 100644
index ec434d3..0000000
--- a/DBTApp/app/src/main/res/values-w1240dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-      <dimen name="fab_margin">200dp</dimen>
-   </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values-w600dp/dimens.xml b/DBTApp/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 10125a3..0000000
--- a/DBTApp/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-      <dimen name="fab_margin">48dp</dimen>
-   </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values/dimens.xml b/DBTApp/app/src/main/res/values/dimens.xml
deleted file mode 100644
index b789d50..0000000
--- a/DBTApp/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-      <dimen name="fab_margin">16dp</dimen>
-   </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values/strings.xml b/DBTApp/app/src/main/res/values/strings.xml
index 75f145c..852e092 100644
--- a/DBTApp/app/src/main/res/values/strings.xml
+++ b/DBTApp/app/src/main/res/values/strings.xml
@@ -1,13 +1,3 @@
 <resources>
-    <string name="app_name">DBT App</string>
-    <!-- Strings used for fragments for navigation -->
-    <string name="first_fragment_label">First Fragment</string>
-
-    <string name="tracking">Tracking</string>
-    <string name="skill_list">Skill list</string>
-    <string name="favourites">Favourites</string>
-    <string name="home">Home\n</string>
-    <string name="skills_chain">Skills chains\n</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-    <string name="emergency_button">Emergency</string>
+    <string name="app_name">DBTApp</string>
 </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/main/res/values/themes.xml b/DBTApp/app/src/main/res/values/themes.xml
index 8ff576c..0685127 100644
--- a/DBTApp/app/src/main/res/values/themes.xml
+++ b/DBTApp/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.DBTApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="Theme.DBTApp" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
@@ -13,9 +13,4 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
-  <!-- Base application theme. -->
-    <style name="Base.Theme.DBTApp" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
-    </style>
 </resources>
\ No newline at end of file
diff --git a/DBTApp/app/src/test/java/de/cdaut/dbt/ExampleUnitTest.kt b/DBTApp/app/src/test/java/de/cdaut/dbtapp/ExampleUnitTest.kt
similarity index 92%
rename from DBTApp/app/src/test/java/de/cdaut/dbt/ExampleUnitTest.kt
rename to DBTApp/app/src/test/java/de/cdaut/dbtapp/ExampleUnitTest.kt
index 9ab9e74..1987caf 100644
--- a/DBTApp/app/src/test/java/de/cdaut/dbt/ExampleUnitTest.kt
+++ b/DBTApp/app/src/test/java/de/cdaut/dbtapp/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package de.cdaut.dbt
+package de.cdaut.dbtapp
 
 import org.junit.Test
 
diff --git a/DBTApp/gradle/libs.versions.toml b/DBTApp/gradle/libs.versions.toml
index aec03ea..9da957c 100644
--- a/DBTApp/gradle/libs.versions.toml
+++ b/DBTApp/gradle/libs.versions.toml
@@ -1,43 +1,28 @@
 [versions]
-activityCompose = "1.10.1"
 agp = "8.9.2"
 kotlin = "2.0.21"
-coreKtx = "1.10.1"
+coreKtx = "1.16.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
-espressoCore = "3.5.1"
-appcompat = "1.6.1"
-material = "1.10.0"
-constraintlayout = "2.1.4"
-navigationFragmentKtx = "2.6.0"
-navigationUiKtx = "2.6.0"
-runtimeAndroid = "1.8.1"
-uiToolingPreviewAndroid = "1.8.1"
-material3Android = "1.3.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+material = "1.12.0"
 
 [libraries]
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3 = { module = "androidx.compose.material3:material3" }
-androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+androidx-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-material = { group = "com.google.android.material", name = "material", version = "1.12.0" }
-androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
-androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
-androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
-androidx-runtime-android = { group = "androidx.compose.runtime", name = "runtime-android", version.ref = "runtimeAndroid" }
-androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
-androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
-material3 = { module = "androidx.compose.material3:material3" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/DBTApp/gradle/wrapper/gradle-wrapper.properties b/DBTApp/gradle/wrapper/gradle-wrapper.properties
index deb2368..39898bb 100644
--- a/DBTApp/gradle/wrapper/gradle-wrapper.properties
+++ b/DBTApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Sat May 03 16:52:58 GMT 2025
+#Mon May 12 19:45:20 GMT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
diff --git a/DBTApp/settings.gradle.kts b/DBTApp/settings.gradle.kts
index ca6593c..840f442 100644
--- a/DBTApp/settings.gradle.kts
+++ b/DBTApp/settings.gradle.kts
@@ -19,6 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "DBT App"
+rootProject.name = "DBTApp"
 include(":app")
- 
\ No newline at end of file