Merge commit '13ace96ffd3d5848b54cee515bc2fe3a02d0cffe'

i3/i3config

@@ -162,20 +162,32 @@ bindsym Mod1+Tab exec --no-startup-id "rofi -show window"
 bindsym Mod1+F2 exec --no-startup-id "rofi -show run"
 
 #Lock
-bindsym $mod+Escape exec --no-startup-id "i3lock"
+bindsym $mod+Escape exec --no-startup-id "i3lock -c 000000 -f"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-bar {
-        status_command i3status
-}
+#bar {
+        #status_command i3status
+#}
 
 exec --no-startup-id nitrogen --restore
 exec --no-startup-id nm-applet
 exec --no-startup-id owncloud
 exec --no-startup-id "xset dpms 60"
 exec --no-startup-id "polybar top"
-#exec --no-startup-id "polybar bottom"
+exec --no-startup-id "polybar bottom"
 exec --no-startup-id "xfsettingsd"
 exec --no-startup-id "xfce4-power-manager"
 exec --no-startup-id "owncloud"
+exec --no-startup-id "caffeine"
+
+#Colors
+# class                 border  backgr. text    indicator child_border
+client.placeholder      #242424 #242424 #242424
+client.background       #242424 #242424 #242424
+client.focused          #4A4A4A #4A4A4A #e5e5e5 #4A4A4A
+client.unfocused        #222222 #222222 #aaaaaa #222222
+client.focused_inactive #222222 #222222 #a9a9a9 #222222
+client.urgent           #4A4A4A #4A4A4A #f7f7f7 #4A4A4A
+
+hide_edge_borders both