Merge branch 'development'

i3/config

@@ -27,7 +27,7 @@ font xft:URWGothic-Book 11
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec terminal
+bindsym $mod+Return exec terminator
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -125,9 +125,9 @@ bindsym $mod+Mod1+w split h; layout tabbed
 bindsym $mod+x split h, layout splith, focus right, move left, focus left
 bindsym $mod+Shift+x split h, layout splith, focus left, move right, focus right
 
-# special combo for stacked split of two windows next to each other
-bindsym $mod+z split h, layout stacked, focus right, move left, focus up
-bindsym $mod+Shift+z split h, layout stacked, focus left, move right, move up, focus down
+# special combo for container tabbed split of two windows next to each other
+bindsym $mod+z split h, layout tabbed, focus right, move left, focus left
+bindsym $mod+Shift+z split h, layout tabbed, focus left, move right, focus right
 
 # toggle fullscreen mode for the focused container
 bindsym $mod+space fullscreen toggle

openbox/rc.xml

@@ -198,7 +198,7 @@
     </keybind>
     <keybind key="W-Return">
       <action name="Execute">
-        <command>urxvt</command>
+        <command>terminator</command>
       </action>
     </keybind>
     <keybind key="W-F1">
@@ -816,4 +816,4 @@
   # end of the example
 -->
   </applications>
-</openbox_config>
+</openbox_config>
\ No newline at end of file