diff --git a/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java b/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java
index ca04ef8..2bd9ae9 100644
--- a/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/LauncherActivity.java
@@ -32,7 +32,7 @@ public class LauncherActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTheme(android.R.style.Theme_Material_Light_NoActionBar);
+        setTheme(R.style.AppThemeNoActionbar);
         setContentView(R.layout.activity_main);
     }
 
diff --git a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
index 5eab5d1..c08ba99 100644
--- a/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
+++ b/app/src/main/java/de/tadris/fitness/activity/ShowWorkoutActivity.java
@@ -144,11 +144,20 @@ public class ShowWorkoutActivity extends WorkoutActivity implements DialogUtils.
     }
 
     private void updateCommentText() {
-        String commentStr = getString(R.string.comment) + ": " + workout.comment;
+        String str = "";
         if (workout.edited) {
-            commentStr = getString(R.string.workoutEdited) + "\n" + commentStr;
+            str += getString(R.string.workoutEdited);
         }
-        commentView.setText(commentStr);
+        if (workout.comment != null && workout.comment.length() > 0) {
+            if (str.length() > 0) {
+                str += "\n";
+            }
+            str += getString(R.string.comment) + ": " + workout.comment;
+        }
+        if (str.length() == 0) {
+            str = getString(R.string.noComment);
+        }
+        commentView.setText(str);
     }
 
     private String getDate() {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e634bad..287b98e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@android:style/Theme.Material.Light.NoActionBar"
+    android:theme="@style/AppThemeNoActionbar"
     tools:context=".activity.LauncherActivity">
 
     <ImageView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2bea43a..8c82699 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,9 @@
     <color name="colorPrimaryBicycling">#523220</color>
     <color name="colorPrimaryDarkBicycling">#462A1D</color>
 
+    <color name="colorPrimaryBicyclingLighter">#6E422A</color>
+    <color name="colorPrimaryDarkBicyclingLighter">#5A3625</color>
+
     <color name="colorAccent">#4CAF50</color>
     <color name="colorAccentDark">#2E7D32</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4845e3..65468c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,4 +174,5 @@
     <string name="OpenStreetMapAttribution">© OpenStreetMap contributors</string>
     <string name="theme">Theme</string>
     <string name="hintRestart">Please restart the app to apply changes</string>
+    <string name="noComment">No comment</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ad6a1a8..dc5c01b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,11 @@
 
 <resources>
 
+    <style name="AppThemeNoActionbar" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+    </style>
 
     <style name="AppTheme" parent="android:Theme.Material.Light.DarkActionBar">
         <item name="android:colorPrimary">@color/colorPrimary</item>