diff --git a/i3config b/i3config
new file mode 100644
index 0000000..264333d
--- /dev/null
+++ b/i3config
@@ -0,0 +1,211 @@
+#Audio
+bindsym XF86AudioRaiseVolume exec "amixer set Master 5%+ unmute"
+bindsym XF86AudioLowerVolume exec "amixer set Master 5%- unmute"
+bindsym XF86AudioMute exec "amixer -D pulse set Master 1+ toggle"
+
+#screensaver
+bindsym $mod+Shift+z exec "i3lock -i ~/.i3/wall.png; sleep 60; pgrep i3lock && xset dpms force off"
+exec xautolock -time 3 -locker 'i3lock -i ~/.i3/wall.png; sleep 60; pgrep i3lock && xset dpms force off' &
+
+#startup
+exec --no-startup-id i3-msg 'workspace 10; exec /home/stonewareslord/xmodmap.sh&/usr/bin/owncloud&/usr/bin/redshift t -l 36.3:-80.3 -t 6500:4000&wicd-gtk&'
+exec --no-startup-id i3-msg 'workspace 2; exec /usr/bin/firefox'
+exec --no-startup-id i3-msg 'workspace 1; exec /usr/bin/konsole -e wemux'
+
+#colors
+# color defines for zenburn styled i3
+set $bg     #2c2c2e
+set $fg     #9f9f9f
+set $hi     #efef8f
+set $ac     #a0afa0
+set $tx     #040404
+set $ia     #8f8f8f
+set $be     #8faf9f
+set $yw     #ccdc90
+set $gn     #88b090
+set $rd     #e89393
+
+# set some nice colors      border     background  text
+client.focused              $ac        $ac         $tx
+client.unfocused            $bg        $bg         $ia
+client.focused_inactive     $bg        $bg         $ac
+client.urgent               $rd        $rd         $tx
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+    status_command i3status
+    # --config ~/.i3/i3status.conf
+
+    colors {
+        background          $bg
+        statusline          $fg
+        separator           $hi
+        focused_workspace   $gn        $bg        $ac
+        active_workspace    $gn        $ac        $tx
+        inactive_workspace  $bg        $bg        $ia
+        urgent_workspace    $rd        $bg        $ac
+    }
+}
+
+
+
+
+
+new_window pixel 1
+# split in vertical orientation
+bindsym $mod+v split h
+# split in horizontal orientation
+bindsym $mod+Shift+v split v
+
+# split in vertical orientation
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym $mod+h resize shrink width 10 px or 10 ppt
+        bindsym $mod+j resize grow height 10 px or 10 ppt
+        bindsym $mod+k resize shrink height 10 px or 10 ppt
+        bindsym $mod+l resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout somewhen, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below. ISO 10646 = Unicode
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, if you need a lot of unicode glyphs or
+# right-to-left text rendering, you should instead use pango for rendering and
+# chose a FreeType font, such as:
+# font pango:DejaVu Sans Mono 10
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec konsole
+
+# kill focused window
+bindsym $mod+Shift+c kill
+
+# start dmenu (a program launcher)
+bindsym $mod+p exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+r reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+grave exec "i3lock -i ~/.i3/wall.png; sleep 60; pgrep i3lock && xset dpms force off"
+# 
+bindsym $mod+Shift+grave exec "i3lock -i ~/.i3/wall.png; dbus-send --system --print-reply --dest=\"org.freedesktop.UPower\" /org/freedesktop/UPower org.freedesktop.UPower.Suspend"
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+q restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+
+bindsym $mod+r mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+#bar {
+#        #status_command i3status
+#}
diff --git a/sync.sh b/sync.sh
index e0defde..aaa03b7 100755
--- a/sync.sh
+++ b/sync.sh
@@ -59,9 +59,9 @@ while getopts ":hbsdtclw" VALUE "$@"; do
   if [ "$VALUE" = "c" ] ; then
     echo "Syncing config files"
     if which trash >/dev/null; then
-      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.bashrc ~/.pylintrc ~/.zshrc
+      trash ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config
     else
-      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.bashrc ~/.pylintrc ~/.zshrc
+      rm ~/.gitconfig ~/.vimrc ~/.vimperatorrc ~/.bashrc ~/.pylintrc ~/.zshrc ~/.i3/config
     fi
     ln -s ${PWD}/pylintrc ~/.pylintrc
     ln -s ${PWD}/vimrc ~/.vimrc
@@ -69,6 +69,8 @@ while getopts ":hbsdtclw" VALUE "$@"; do
     ln -s ${PWD}/gitconfig ~/.gitconfig
     ln -s ${PWD}/bashrc ~/.bashrc
     ln -s ${PWD}/zshrc ~/.zshrc
+    mkdir ~/.i3
+    ln -s ${PWD}/i3config ~/.i3/config
   fi
   if [ "$VALUE" = "l" ] ; then
     echo "Linking standard directories..."
diff --git a/zshrc b/zshrc
index 192b260..71c6b9a 100644
--- a/zshrc
+++ b/zshrc
@@ -171,8 +171,7 @@ function k(){
     vim "$@"
   elif [ -d "$@" ] ; then
     cd "$@" && ls
-
-  elif [ "$@" -eq "-" ] ; then
+  elif [[ "$@" == "-" ]] ; then
     cd - && ls
   elif [ -f "$@" ] ; then
     case $1 in
@@ -198,4 +197,4 @@ function k(){
     fi
   fi
 }
-function mcl(){ mkdir "$@"&&cl "$@"; }
+function mcl(){ mkdir "$@"&&k "$@"; }