diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
index 845b1835..006050b3 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt
@@ -15,6 +15,7 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface
 import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment
 import net.pokeranalytics.android.ui.fragment.components.BottomSheetType
+import net.pokeranalytics.android.util.PokerAnalyticsActivity
 import net.pokeranalytics.android.util.PokerAnalyticsFragment
 
 class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate {
@@ -56,6 +57,9 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl
 	 */
 	private fun initUI() {
 
+		val activity = activity as PokerAnalyticsActivity
+		activity.setSupportActionBar(toolbar)
+
 		val viewManager = LinearLayoutManager(requireContext())
 		val newSessionAdapter = DynamicListAdapter(newSession, this)
 
@@ -71,7 +75,7 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl
 	 * Set fragment data
 	 */
 	fun setData(isTournament: Boolean) {
-		title.text = if (isTournament) "New tournament" else "New cash game"
+		toolbar.title = if (isTournament) "Tournament" else "Cash game"
 	}
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
index f9bdfe8f..49dee4a6 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt
@@ -2,6 +2,7 @@ package net.pokeranalytics.android.util
 
 import android.os.Bundle
 import android.os.PersistableBundle
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import io.realm.Realm
 
@@ -13,6 +14,15 @@ open class PokerAnalyticsActivity : AppCompatActivity() {
 		super.onCreate(savedInstanceState, persistentState)
 	}
 
+	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+		item?.let {
+			if (it.itemId == android.R.id.home) {
+				finish()
+			}
+		}
+		return super.onOptionsItemSelected(item)
+	}
+
 	override fun onDestroy() {
 		super.onDestroy()
 		realm.close()
diff --git a/app/src/main/res/color/bottom_navigation_item.xml b/app/src/main/res/color/bottom_navigation_item.xml
new file mode 100644
index 00000000..da961584
--- /dev/null
+++ b/app/src/main/res/color/bottom_navigation_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:color="@color/green" android:state_checked="true" android:state_enabled="true" />
+	<item android:color="@color/green_light" android:state_checked="false" android:state_enabled="true" />
+	<item android:color="@color/green_lighter" android:state_checked="false" android:state_enabled="false" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 9c60a84a..af3a6fe8 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -21,7 +21,6 @@
 		android:layout_height="wrap_content"
 		android:layout_marginStart="0dp"
 		android:layout_marginEnd="0dp"
-		android:background="?android:attr/windowBackground"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintLeft_toLeftOf="parent"
 		app:layout_constraintRight_toRightOf="parent"
diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml
index 76eabc63..5db274df 100644
--- a/app/src/main/res/layout/fragment_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_bottom_sheet.xml
@@ -8,7 +8,6 @@
 
 	<androidx.appcompat.widget.Toolbar
 		android:id="@+id/bottomSheetToolbar"
-		style="@style/BottomSheetToolbar"
 		android:layout_width="0dp"
 		android:layout_height="?actionBarSize"
 		app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_new_session.xml b/app/src/main/res/layout/fragment_new_session.xml
index 987c681f..fc9a305a 100644
--- a/app/src/main/res/layout/fragment_new_session.xml
+++ b/app/src/main/res/layout/fragment_new_session.xml
@@ -15,28 +15,14 @@
 			android:layout_width="match_parent"
 			android:layout_height="400dp">
 
-			<androidx.appcompat.widget.AppCompatTextView
-				android:id="@+id/title"
-				style="@style/Title"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginStart="8dp"
-				android:layout_marginTop="8dp"
-				android:layout_marginEnd="8dp"
-				android:text="New session"
-				app:layout_constraintEnd_toEndOf="parent"
-				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toTopOf="parent" />
-
 			<androidx.recyclerview.widget.RecyclerView
 				android:id="@+id/recyclerView"
 				android:layout_width="0dp"
 				android:layout_height="0dp"
-				android:layout_marginTop="8dp"
 				app:layout_constraintBottom_toBottomOf="parent"
 				app:layout_constraintEnd_toEndOf="parent"
 				app:layout_constraintStart_toStartOf="parent"
-				app:layout_constraintTop_toBottomOf="@+id/title" />
+				app:layout_constraintTop_toTopOf="parent" />
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 438fd332..5ae430fa 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="colorPrimary">#008577</color>
-	<color name="colorPrimaryDark">#00574B</color>
-	<color name="colorAccent">#D81B60</color>
+	<color name="colorPrimary">#141414</color>
+	<color name="colorPrimaryDark">#000000</color>
+	<color name="colorAccent">#58C473</color>
 
 	<color name="black">#000000</color>
 	<color name="white">#FFFFFF</color>
+
 	<color name="green">#58C473</color>
+	<color name="green_light">#8A58C473</color>
+	<color name="green_lighter">#3658C473</color>
+
 	<color name="gray_dark_1">#141414</color>
 	<color name="gray_dark_2">#1B1F1B</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f6d293ed..72b0e3de 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,36 +1,57 @@
 <resources>
 
 	<!-- PokerAnalytics application theme -->
-	<style name="PokerAnalyticsTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+	<style name="PokerAnalyticsTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
 		<!-- Customize your theme here. -->
 		<item name="colorPrimary">@color/colorPrimary</item>
 		<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
 		<item name="colorAccent">@color/colorAccent</item>
+		<item name="android:windowBackground">@color/gray_dark_2</item>
+
+		<item name="bottomNavigationStyle">@style/PokerAnalyticsTheme.BottomNavigationView</item>
+		<item name="toolbarStyle">@style/PokerAnalyticsTheme.Toolbar</item>
+		<item name="android:textViewStyle">@style/PokerAnalyticsTheme.TextView</item>
+
+	</style>
+
+	<!-- Defaults -->
+
+	<!-- Bottom Bar -->
+	<style name="PokerAnalyticsTheme.BottomNavigationView">
+		<item name="itemIconTint">@color/bottom_navigation_item</item>
+		<item name="itemTextColor">@color/bottom_navigation_item</item>
+		<item name="android:background">@color/gray_dark_1</item>
 	</style>
 
 	<!-- Toolbar -->
-	<style name="BottomSheetToolbar" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
 		<item name="android:background">@color/gray_dark_1</item>
 		<item name="titleTextColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto_bold </item>
+	</style>
+
+	<style name="PokerAnalyticsTheme.TextView">
+		<item name="android:textColor">@color/white</item>
+		<item name="android:fontFamily">@font/roboto</item>
 	</style>
 
 
 	<!-- TextView -->
-	<style name="Title" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.Title" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">22sp</item>
-		<item name="android:textColor">@color/gray_dark_1</item>
+		<item name="android:textColor">@color/white</item>
 		<item name="android:fontFamily">@font/roboto_bold</item>
 		<item name="android:paddingTop">8dp</item>
 	</style>
 
-	<style name="Header" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.Header" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">22sp</item>
 		<item name="android:textColor">@color/gray_dark_1</item>
 		<item name="android:fontFamily">@font/roboto_bold</item>
 		<item name="android:paddingTop">8dp</item>
 	</style>
 
-	<style name="RowTitle" parent="PokerAnalyticsTheme">
+	<style name="PokerAnalyticsTheme.TextView.TitleRow" parent="PokerAnalyticsTheme">
 		<item name="android:textSize">16sp</item>
 		<item name="android:textColor">@color/gray_dark_1</item>
 		<item name="android:fontFamily">@font/roboto</item>