diff --git a/theme.jl b/theme.jl
index 922e659..7173601 100644
--- a/theme.jl
+++ b/theme.jl
@@ -2,22 +2,31 @@
 ;; Author  : Tom Willemse <tom@ryuslash.org>
 ;; License : GPL-3+
 
-(default-frame
-  `(((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . -4) (width . 30) (height . 26) (text . "×") (x-justify . center) (y-justify . center) (top-edge . -26) (class . close-button))
-    ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 26) (width . 26) (height . 26) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . -26) (class . maximize-button))
-    ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 51) (width . 26) (height . 26) (text . "_") (x-justify . center) (y-justify . center) (top-edge . -26) (class . iconify-button))
-    ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . -4) (width . 21) (height . 26) (top-edge . -26) (class . menu-button) (text . "⮟") (x-justify . center) (y-justify . center))
-    ((background . ("#222424")) (right-edge . -4) (width . 4) (top-edge . 0) (bottom-edge . 0) (class . right-border))
-    ((background . ("#222424")) (left-edge . -4) (width . 4) (top-edge . 0) (bottom-edge . 0) (class . left-border))
-    ((background . ("#222424")) (right-edge . 0)  (left-edge . 0)  (height . 4) (bottom-edge . -4) (class . bottom-border))
-    ((background . ("#222424")) (left-edge . -4) (width . 4) (height . 4) (bottom-edge . -4) (class . bottom-left-corner))
-    ((background . ("#222424")) (right-edge . -4) (width . 4) (height . 4) (bottom-edge . -4) (class . bottom-right-corner))
+(let* (
 
-    ((background . ("#111414"))  (right-edge . 77) (left-edge . 17)              (height . 26) (top-edge . -26)
-     (foreground . ("#bfbfbf" "#ff9800"))  (text . ,window-name) (x-justify . center) (y-justify . center) (class . title))))
+    (default-frame
+      `(
+        ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . -4) (width . 30) (height . 26) (text . "×") (x-justify . center) (y-justify . center) (top-edge . -26) (class . close-button))
+        ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 26) (width . 26) (height . 26) (text . "☐") (x-justify . center) (y-justify . center) (top-edge . -26) (class . maximize-button))
+        ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (right-edge . 51) (width . 26) (height . 26) (text . "_") (x-justify . center) (y-justify . center) (top-edge . -26) (class . iconify-button))
+        ((background . ("#111414")) (foreground "#bfbfbf" "#ff9800") (left-edge . -4) (width . 21) (height . 26) (top-edge . -26) (class . menu-button) (text . "⮟") (x-justify . center) (y-justify . center))
+        ((background . ("#222424")) (right-edge . -5) (width . 5) (top-edge . 0) (bottom-edge . 0) (class . right-border))
+        ((background . ("#222424")) (left-edge . -5) (width . 5) (top-edge . 0) (bottom-edge . 0) (class . left-border))
+        ((background . ("#111414")) (right-edge . 0)  (left-edge . 0)  (height . 5) (bottom-edge . -5) (class . bottom-border))
+        ((background . ("#111414")) (left-edge . -5) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-left-corner))
+        ((background . ("#111414")) (right-edge . -5) (width . 5) (height . 5) (bottom-edge . -5) (class . bottom-right-corner))
+
+        ((background . ("#111414"))  (right-edge . 77) (left-edge . 17)              (height . 26) (top-edge . -26)
+         (foreground . ("#bfbfbf" "#ff9800"))  (text . ,window-name) (x-justify . center) (y-justify . center) (class . title))
+        )
+      ))
 
 
-(add-frame-style 'yoshi
-                 (lambda (w type)
-                   (case type
-                         ((default) default-frame))))
+  (add-frame-style 'yoshi
+                   (lambda (w type)
+                     (case type
+                           ((default) default-frame)
+                           )
+                     )
+                   )
+       )