diff --git a/src/styl/custom_theme.styl b/src/styl/custom_theme.styl
index f738247c61..25b37a2481 100644
--- a/src/styl/custom_theme.styl
+++ b/src/styl/custom_theme.styl
@@ -10,36 +10,36 @@
   &.anthracite
     > main
       background-position initial
-      background-image url('../../../../lichobile-themes/background/anthracite.jpg')
+      background-image url('../../../themes/background/anthracite.jpg')
   &.space
     .main_header.board .chip, .chip
       color rgba(#120100, 0.9)
       border-color rgba(#120100, 0.9)
     > main
-      background-image url('../../../../lichobile-themes/background/space.jpg')
+      background-image url('../../../themes/background/space.jpg')
   &.checkerboard
     > main
-      background-image url('../../../../lichobile-themes/background/checkerboard.png')
+      background-image url('../../../themes/background/checkerboard.png')
     .main_header.board .chip, .chip
       color rgba(#0a160b, 0.9)
       border-color rgba(#0a160b, 0.9)
   &.blue-maze
     > main
-      background-image url('../../../../lichobile-themes/background/blue-maze.jpg')
+      background-image url('../../../themes/background/blue-maze.jpg')
       background-position bottom
     .main_header.board .chip, .chip
       color rgba(#041320, 0.9)
       border-color rgba(#041320, 0.9)
   &.green-maze
     > main
-      background-image url('../../../../lichobile-themes/background/green-maze.jpg')
+      background-image url('../../../themes/background/green-maze.jpg')
       background-position bottom
     .main_header.board .chip, .chip
       color rgba(#0a160b, 0.9)
       border-color rgba(#0a160b, 0.9)
   &.red-maze
     > main
-      background-image url('../../../../lichobile-themes/background/red-maze.jpg')
+      background-image url('../../../themes/background/red-maze.jpg')
       background-position bottom
     .main_header.board .chip, .chip
       color rgba(#170407, 0.9)
@@ -47,13 +47,13 @@
   &.wood
     > main
       background-position initial
-      background-image url('../../../../lichobile-themes/background/wood.jpg')
+      background-image url('../../../themes/background/wood.jpg')
     .main_header.board .chip, .chip
       color rgba(#1c0a07, 0.9)
       border-color rgba(#1c0a07, 0.9)
   &.bgshapes
     > main
-      background-image url('../../../../lichobile-themes/background/bgshapes.jpg')
+      background-image url('../../../themes/background/bgshapes.jpg')
 
   main, .main_header, .action_bar_button, .antagonistUser
     color textTransp
diff --git a/src/styl/game.styl b/src/styl/game.styl
index 9119b70f36..ff688d16a1 100644
--- a/src/styl/game.styl
+++ b/src/styl/game.styl
@@ -24,7 +24,7 @@
   display flex
   overflow hidden
   justify-content space-between
-  align-items stretch
+  align-items center
   &.clockOnLeft
     > .antagonistInfos
       order 2
@@ -150,6 +150,7 @@
     > .antagonistUser
       font-size 1em
     > .clock
+      padding 0 2vmin
       line-height 30px
       display inline-block
       fluid-type(20px, 30px)
@@ -197,7 +198,7 @@
   font-family 'Roboto'
   text-align right
   fluid-type(32px, 48px)
-  padding 0 2vmin
+  padding 1vmax 2vmin
   color textDarkBg
   background-color #262626
   > seph
@@ -209,12 +210,10 @@
   &.running
     background-color darkGreen
     color #fff
-  &.berserk
-    color #e35d5b
   &.emerg
-    background-color #a00000
-    color #d0d0d0
+    background-color #502826
     &.running
+      background-color lighten(#502826, 15%)
       color #fff
   &.correspondence
     font-family inherit
@@ -474,7 +473,7 @@
   .antagonistUser
     color textDarkGray
   .clock
-    color #707070
+    color lighten(themeBgLightText, 5%)
     background-color themeBgLight
     border-color #ccc
     &.running
@@ -483,8 +482,10 @@
     &.berserk
       border-color #dc322f
     &.emerg
-      background-color #efaaaa
-      color textDarkGray
+      background-color #f2cccc
+      &.running
+        color #000
+        background-color #e69999
     &.correspondence
       &.offline
         background-color themeBgLight
@@ -499,9 +500,10 @@
     &.running
       color #fff
     &.emerg
-      background-color rgba(#a00000, 0.6)
-      color #d0d0d0
+      color rgba(#8c8c8c, 0.8)
+      background-color rgba(#a00000, 0.4)
       &.running
+        background-color rgba(lighten(#a00000, 30%), 0.4)
         color #fff
   .replay
     background transpBlack04
diff --git a/src/styl/offline-game.styl b/src/styl/offline-game.styl
index 85c17d8018..dc82d76e4a 100644
--- a/src/styl/offline-game.styl
+++ b/src/styl/offline-game.styl
@@ -68,9 +68,6 @@
   font-size 15px
   line-height 1
 
-.clock.outoftime
-    background-color #a00000
-
 .antagonistInfos.crazy
   >.antagonistUser
     >.clockInfo
diff --git a/themes/README.md b/themes/README.md
new file mode 100644
index 0000000000..f24600f2d0
--- /dev/null
+++ b/themes/README.md
@@ -0,0 +1,7 @@
+# lichobile-themes
+
+## Credits
+
+blue-maze.jpg, green-maze.jpg, red-maze.jpg are wallpapers from [Untergunter](http://untergunter.deviantart.com/)
+
+Original set, Closed Maze, available [here](http://untergunter.deviantart.com/art/Closed-Maze-176851625).
diff --git a/themes/background/anthracite.jpg b/themes/background/anthracite.jpg
new file mode 100644
index 0000000000..982d54867b
Binary files /dev/null and b/themes/background/anthracite.jpg differ
diff --git a/themes/background/bgshapes.jpg b/themes/background/bgshapes.jpg
new file mode 100644
index 0000000000..dc134b420a
Binary files /dev/null and b/themes/background/bgshapes.jpg differ
diff --git a/themes/background/blue-maze.jpg b/themes/background/blue-maze.jpg
new file mode 100644
index 0000000000..12027b08d9
Binary files /dev/null and b/themes/background/blue-maze.jpg differ
diff --git a/themes/background/checkerboard.png b/themes/background/checkerboard.png
new file mode 100644
index 0000000000..7ff22f5769
Binary files /dev/null and b/themes/background/checkerboard.png differ
diff --git a/themes/background/earth.jpg b/themes/background/earth.jpg
new file mode 100644
index 0000000000..076f76a88c
Binary files /dev/null and b/themes/background/earth.jpg differ
diff --git a/themes/background/green-maze.jpg b/themes/background/green-maze.jpg
new file mode 100644
index 0000000000..7a75847520
Binary files /dev/null and b/themes/background/green-maze.jpg differ
diff --git a/themes/background/red-maze.jpg b/themes/background/red-maze.jpg
new file mode 100644
index 0000000000..24ac0b5086
Binary files /dev/null and b/themes/background/red-maze.jpg differ
diff --git a/themes/background/space.jpg b/themes/background/space.jpg
new file mode 100644
index 0000000000..a5a825435d
Binary files /dev/null and b/themes/background/space.jpg differ
diff --git a/themes/background/wood.jpg b/themes/background/wood.jpg
new file mode 100644
index 0000000000..4de72169af
Binary files /dev/null and b/themes/background/wood.jpg differ