2 files changed, 17 insertions, 11 deletions
diff --git a/src/Rahm/Desktop/Layout/Draw.hs b/src/Rahm/Desktop/Layout/Draw.hs
index aa4dba3..8380e98 100644
--- a/src/Rahm/Desktop/Layout/Draw.hs
+++ b/src/Rahm/Desktop/Layout/Draw.hs
@@ -130,23 +130,29 @@ drawXpm ::
 drawXpm (w, h) rects' shrinkAmt = execWriter $ do
     tell "/* XPM */\n"
     tell "static char *out[] = {\n"
-    tell $ printf "\"%d %d %d 1 \",\n" w h (length rects + 1)
+    tell $ printf "\"%d %d %d 1 \",\n" (w + 7) (h + 7) (length rects + 1)
 
     let zipRects = zip ['A' .. 'Z'] rects
 
     forM_ zipRects $ \(char, (color, _)) -> do
       tell $ printf "\"%c c %s\",\n" char color
-    tell "\"% c None\",\n"
-
-    forM_ [0 .. h - 1] $ \y -> do
-      tell "\""
-      forM_ [0 .. w - 1] $ \x ->
+    tell "\"% c #000000\",\n"
+
+    forM_ [0..2] $ \_ -> do
+      tell "\"%%%"
+      forM_ [0 .. w] $ \_ -> tell "%"
+      tell "%%%\"\n"
+    forM_ [0 .. h] $ \y -> do
+      tell "\"%%%"
+      forM_ [0 .. w] $ \x ->
         (case find (matches x y) zipRects of
           Nothing -> tell "%"
           Just (chr, _) -> tell [chr])
-      tell "\""
-      when (y /= h - 1 - shrinkAmt) (tell ",")
-      tell "\n"
+      tell "%%%\"\n"
+    forM_ [0..2] $ \_ -> do
+      tell "\"%%%"
+      forM_ [0 .. w] $ \_ -> tell "%"
+      tell "%%%\"\n"
     tell "};\n"
 
   where
diff --git a/src/Rahm/Desktop/XMobarLog.hs b/src/Rahm/Desktop/XMobarLog.hs
index 637670e..d0dcc4f 100644
--- a/src/Rahm/Desktop/XMobarLog.hs
+++ b/src/Rahm/Desktop/XMobarLog.hs
@@ -46,7 +46,7 @@ xMobarLogHook (XMobarLog xmproc) = do
     hPutStrLn xmproc $ trunc 80 $ execWriter $ do
       tell " "
       tell layoutXpm
-      tell $ "  "
+      tell $ "   "
 
       forM_ wss $ \(t, ws) -> do
         case t of
@@ -57,7 +57,7 @@ xMobarLogHook (XMobarLog xmproc) = do
         tell $ toAction $ S.tag ws
         tell " </fc></fn>"
 
-      tell $ " <fc=#a0a0a0><fn=3>"
+      tell $ "   <fc=#ff8888><fn=3>"
       tell $ title
       tell $ "</fn></fc>"