diff --git a/.i3/config b/.config/i3/config
similarity index 87%
rename from .i3/config
rename to .config/i3/config
index ba45502..2d0e17d 100644
--- a/.i3/config
+++ b/.config/i3/config
@@ -11,9 +11,6 @@
 
 set $mod Mod4
 
-# font for window titles. ISO 10646 = Unicode
-font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-
 # poweroff stuff
 set $mode_system System: (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
 mode "$mode_system" {
@@ -36,7 +33,7 @@ floating_modifier $mod
 bindsym $mod+Return exec i3-sensible-terminal
 
 # start emacs
-bindsym $mod+Shift+Return exec i3-sensible-editor
+bindsym $mod+Shift+Return exec em
 
 # kill focused window
 bindsym $mod+Shift+Q kill
@@ -44,9 +41,6 @@ bindsym $mod+Shift+Q kill
 # start dmenu (a program launcher)
 bindsym $mod+d exec dmenu_run
 
-# lock screen (i3lock)
-bindsym $mod+Escape exec i3lock -c 000000
-
 # change focus
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
@@ -136,30 +130,29 @@ bindsym $mod+r mode "resize"
 # colors & style
 new_window normal 1
 new_float normal 1
-client.focused #009900 #009900 #ffffff #007700
-client.focused_inactive #005500 #005500 #000000 #007700
-client.unfocused #005500 #005500 #000000 #007700
-#client.urgent
+client.focused #000000 #009900 #ffffff #ff0000
+client.unfocused #000000 #005500 #000000 #ff0000
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-	status_command		i3status --config ~/.i3/i3status
-	position		top
-	tray_output		primary
-	workspace_buttons	yes
-	mode			hide
-	modifier		$mod
+	status_command i3status --config ~/.config/i3status/config
+	position top
+	tray_output primary
+	workspace_buttons yes
+	mode dock
+	modifier $mod
 
         colors {
           statusline #00ff00
-
           focused_workspace #00cc00 #00ff00 #000000
           inactive_workspace #00cc00 #008b00 #cccccc
 	  #client.orientation #ff0000
         }
 }
 
-exec ssh-agent
-exec gpg-agent
-exec xset -b
+# exec ssh-agent
+# exec gpg-agent
+# exec xset -b
+# exec xrandr --output VGA-2 --auto --right-of VGA-1
+# exec feh --bg-scale ~/bg.jpg
diff --git a/.i3/i3status b/.config/i3status/config
similarity index 77%
rename from .i3/i3status
rename to .config/i3status/config
index e3026b2..14486d1 100644
--- a/.i3/i3status
+++ b/.config/i3status/config
@@ -3,15 +3,15 @@ general {
         interval = 1
 }
 
-order += "ipv6"
+# order += "ipv6"
 order += "ethernet eth0"
 order += "wireless wlan0"
 order += "battery 0"
 order += "cpu_usage"
 order += "load"
-order += "cpu_temperature 0"
 order += "volume master"
-order += "time"
+order += "tztime home"
+order += "tztime utc"
 
 ethernet eth0 {
 	format_up = "E: %ip (%speed)"
@@ -30,15 +30,6 @@ battery 0 {
 	low_threshold = 20
 }
 
-time {
-        format = "%Y-%m-%d %H:%M:%S"
-}
-
-cpu_temperature 0 {
-	format = "%degrees °C"
-	path = "/sys/class/thermal/thermal_zone0/temp"
-}
-
 cpu_usage {
         format = "C: %usage"
 }
@@ -53,3 +44,13 @@ volume master {
         mixer = "Master"
         mixer_idx = 0
 }
+
+tztime home {
+       format = "%Y-%m-%d (%Z) %H:%M:%S"
+       timezone = "Europe/Vienna"
+}
+
+tztime utc {
+       format = "(%Z) %H:%M:%S"
+       timezone = "Etc/UTC"
+}
diff --git a/.gitignore.d/i3 b/.gitignore.d/i3
new file mode 100644
index 0000000..8f02c8d
--- /dev/null
+++ b/.gitignore.d/i3
@@ -0,0 +1,8 @@
+*
+!/.config
+!/.config/i3
+!/.config/i3/config
+!/.config/i3status
+!/.config/i3status/config
+!/.gitignore.d
+!/.gitignore.d/i3