diff --git a/osx/etc-sym/.hammerspoon/caffeine.lua b/osx/etc-sym/.hammerspoon/caffeine.lua
new file mode 100644
index 0000000..9aa068c
--- /dev/null
+++ b/osx/etc-sym/.hammerspoon/caffeine.lua
@@ -0,0 +1,53 @@
+-- Hammerspoon replacement for Caffeine
+-- https://gist.github.com/heptal/50998f66de5aba955c00
+
+local ampOnIcon = [[ASCII:
+.....1a..........AC..........E
+..............................
+......4.......................
+1..........aA..........CE.....
+e.2......4.3...........h......
+..............................
+..............................
+.......................h......
+e.2......6.3..........t..q....
+5..........c..........s.......
+......6..................q....
+......................s..t....
+.....5c.......................
+]]
+
+local ampOffIcon = [[ASCII:
+.....1a.....x....AC.y.......zE
+..............................
+......4.......................
+1..........aA..........CE.....
+e.2......4.3...........h......
+..............................
+..............................
+.......................h......
+e.2......6.3..........t..q....
+5..........c..........s.......
+......6..................q....
+......................s..t....
+...x.5c....y.......z..........
+]]
+
+local caffeine = hs.menubar.new()
+
+function setCaffeineDisplay(state)
+    if state then
+        caffeine:setIcon(ampOnIcon)
+    else
+        caffeine:setIcon(ampOffIcon)
+    end
+end
+
+function caffeineClicked()
+    setCaffeineDisplay(hs.caffeinate.toggle("displayIdle"))
+end
+
+if caffeine then
+    caffeine:setClickCallback(caffeineClicked)
+    setCaffeineDisplay(hs.caffeinate.get("displayIdle"))
+end
diff --git a/osx/etc-sym/.hammerspoon/init.lua b/osx/etc-sym/.hammerspoon/init.lua
index 1dcaa80..daaffc8 100644
--- a/osx/etc-sym/.hammerspoon/init.lua
+++ b/osx/etc-sym/.hammerspoon/init.lua
@@ -24,6 +24,7 @@ require "window-layout"
 require "wallpaper"
 require "wifi"
 require "usb"
+require "caffeine"
 
 -- print config loaded
 hs.notify.show("Loaded Config", "Have fun!", "")
diff --git a/osx/etc-sym/.hammerspoon/window-grid.lua b/osx/etc-sym/.hammerspoon/window-grid.lua
index a2edd55..be1f6e9 100644
--- a/osx/etc-sym/.hammerspoon/window-grid.lua
+++ b/osx/etc-sym/.hammerspoon/window-grid.lua
@@ -29,7 +29,7 @@ local gh = hs.grid.GRIDHEIGHT
 hs.hotkey.bind(hyper, 'Left', gridset({x = 0, y = 0, w = gw/2, h = gh}))
 hs.hotkey.bind(hyper, 'Right', gridset({x = gw/2, y = 0, w = gw/2, h = gh}))
 hs.hotkey.bind(hyper, 'Up', gridset({x = 0, y = 0, w = gw, h = gh/2}))
-hs.hotkey.bind(hyper, 'Down', gridset({x = 0, y = 0, w = gw, h = gh/2}))
+hs.hotkey.bind(hyper, 'Down', gridset({x = 0, y = gh/2, w = gw, h = gh/2}))
 
 -- move window position inside the grid
 hs.hotkey.bind(hyper_shift, 'Left', hs.grid.pushWindowLeft)
diff --git a/osx/etc-sym/.lolcommits b/osx/etc-sym/.lolcommits
deleted file mode 120000
index fda12b8..0000000
--- a/osx/etc-sym/.lolcommits
+++ /dev/null
@@ -1 +0,0 @@
-/Users/bluemaex/Seafile/Photos/lolcommits
\ No newline at end of file
diff --git a/osx/etc/.atom/config.cson b/osx/etc/.atom/config.cson
index bffc4b1..44eda6a 100644
--- a/osx/etc/.atom/config.cson
+++ b/osx/etc/.atom/config.cson
@@ -8,6 +8,8 @@
       screenShake: true
     screenShake:
       enabled: false
+  "atom-ide-ui":
+    use: {}
   core:
     disabledPackages: [
       "language-javascript"
@@ -26,6 +28,8 @@
     panelHeight: 69
     showPanel: true
   minimap: {}
+  "php-ide-serenata":
+    storagePath: "/Users/bluemaex/Library/Preferences/php-ide-serenata"
   "php-integrator-base":
     general:
       indexContinuously: false
@@ -39,6 +43,7 @@
     defaultShowInherited: true
   "prettier-atom":
     formatOnSaveOptions:
+      enabled: true
       isDisabledIfNotInPackageJson: true
       showInStatusBar: true
     prettierOptions:
diff --git a/osx/etc-sym/.iterm2_shell_integration.sh b/osx/etc/.iterm2_shell_integration.sh
similarity index 100%
rename from osx/etc-sym/.iterm2_shell_integration.sh
rename to osx/etc/.iterm2_shell_integration.sh