diff --git a/gitignore b/gitignore
index 702ebda..7ab3fe2 100644
--- a/gitignore
+++ b/gitignore
@@ -1 +1,2 @@
 .ropeproject
+rol_mails/
diff --git a/ohmyzshrc b/ohmyzshrc
index 2419fa7..b65807d 100644
--- a/ohmyzshrc
+++ b/ohmyzshrc
@@ -2,6 +2,8 @@ export TERM=xterm-256color
 export ZSH_TMUX_AUTOSTART=true
 export ZSH_TMUX_FIXTERM=false
 
+export PATH=~/.npm-global/bin:$PATH
+
 # Path to your oh-my-zsh installation.
 export ZSH=~/.oh-my-zsh
 export LC_ALL=en_US.UTF-8
@@ -61,9 +63,13 @@ zstyle :omz:plugins:ssh-agent identities id_ed25519
 
 # User configuration
 
-  export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+# export PATH="/home/asmaps/bin:/home/asmaps/openclonk:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+export PATH=$PATH:/home/asmaps/bin
 # export MANPATH="/usr/local/man:$MANPATH"
 
+export ANDROID_HOME="$HOME/Android/Sdk"
+export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
+
 source $ZSH/oh-my-zsh.sh
 
 # You may need to manually set your language environment
@@ -93,5 +99,12 @@ source $ZSH/oh-my-zsh.sh
 
 alias mkvirtualenv3="mkvirtualenv -p `which python3`"
 alias dc="docker-compose"
+alias ap="ansible-playbook"
+alias apa="ansible-playbook ansible/ansible.yml -i ansible/hosts"
+alias apak="ansible-playbook ansible/ansible.yml -i ansible/hosts -K"
+alias aps="ansible-playbook ansible/setup.yml -i ansible/hosts -K"
+alias apau="ansible-playbook ansible/ansible.yml --tags update -i ansible/hosts -K"
+alias ssh-nocare-hostkey="ssh -o PubkeyAuthentication=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+alias ssh-nocare="ssh -o PubkeyAuthentication=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 stty -ixon
diff --git a/qtile_config.py b/qtile_config.py
index 557a70b..444abef 100644
--- a/qtile_config.py
+++ b/qtile_config.py
@@ -42,6 +42,7 @@ def spawn_with_env_lazy(command, env):
 
 
 mod = "mod4"
+alt = "mod1"
 home = os.path.expanduser('~')
 
 keys = [
@@ -53,10 +54,18 @@ keys = [
         [mod, "control"], "2",
         lazy.spawn("sh -c " + home + "/.screenlayout/2screens.sh"),
     ),
+    Key(
+        [mod, "control", "shift"], "2",
+        lazy.spawn("sh -c " + home + "/.screenlayout/2screens_ja.sh"),
+    ),
     Key(
         [mod, "control"], "3",
         lazy.spawn("sh -c " + home + "/.screenlayout/3screens.sh"),
     ),
+    Key(
+        [mod, "control", "shift"], "3",
+        lazy.spawn("sh -c " + home + "/.screenlayout/3screens_full.sh"),
+    ),
 
     # Switch between windows in current stack pane
     Key(
@@ -86,6 +95,9 @@ keys = [
         lazy.layout.grow_right()
     ),
 
+    Key([alt], "Tab", lazy.layout.next()),
+    Key([alt, "shift"], "Tab", lazy.layout.previous()),
+
     # Switch window focus to other pane(s) of stack
     Key(
         [mod], "space",
@@ -107,7 +119,7 @@ keys = [
         lazy.layout.toggle_split()
     ),
     Key([mod], "Return", lazy.spawn("terminator")),
-    Key(["control", "mod1"], "l", lazy.spawn("i3lock -i /home/asmaps/Pictures/wallpapers/garfield.png")),
+    Key(["control", "mod1"], "l", lazy.spawn("xscreensaver-command -lock")),
     Key([], "XF86AudioMute", lazy.spawn("pavucontrol")),
     Key([], "XF86MonBrightnessUp", lazy.spawn("xbacklight -inc 3")),
     Key(["shift"], "XF86MonBrightnessUp", lazy.spawn("xbacklight -set 100")),
@@ -115,7 +127,9 @@ keys = [
     Key(["shift"], "XF86MonBrightnessDown", lazy.spawn("xbacklight -set 1")),
     Key([], "XF86LaunchA", lazy.spawn("xinput set-prop 11 \"Device Enabled\" 0")),
     Key(["shift"], "XF86LaunchA", lazy.spawn("xinput set-prop 11 \"Device Enabled\" 1")),
-    Key(['mod1', "control"], "f", lazy.spawn('/home/ars/start_ff.sh')),
+    Key(['mod1', "control"], "p", lazy.spawn('/home/asmaps/pycharm/pycharm.sh')),
+    Key(['mod1', "control"], "o", lazy.spawn('/home/asmaps/git/openclonk/openclonk')),
+    Key(['mod1', "shift", "control"], "o", lazy.spawn('/home/asmaps/openclonk/openclonk --editor')),
 
     # Toggle between different layouts as defined below
     Key([mod], "Tab", lazy.next_layout()),
@@ -128,7 +142,7 @@ keys = [
     Key([], "Print", lazy.spawn("bash /home/asmaps/.take_screenshot.sh")),
 ]
 
-groups = [Group(i) for i in "12345"]
+groups = [Group(i) for i in "123456789"]
 
 for i in groups:
     # mod1 + letter of group = switch to group
@@ -259,3 +273,5 @@ def execute_once(process):
 @hook.subscribe.startup
 def startup():
     execute_once('nm-applet')
+    execute_once('blueman-applet')
+    execute_once(['xscreensaver', '-nosplash'])
diff --git a/tmux.conf b/tmux.conf
index 1e8c7bc..4748555 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -15,43 +15,17 @@ bind c new-window -c "#{pane_current_path}"
 # basic settings
 set -g history-limit 30000
 set-option -g default-shell /usr/bin/zsh
-set-window-option -g utf8 on
+# set-window-option -g utf8 on
 set -g base-index 1
 
-# vi mode
-set-window-option -g mode-keys vi
-bind-key -t vi-copy 'v' begin-selection
-bind-key -t vi-copy 'y' copy-selection
-
 # escape mode
 unbind [
 bind Escape copy-mode
 set -s escape-time 0
 
-# switch windows
-bind -r j previous-window
-bind -r k next-window
-bind -r h swap-window -t -1
-bind -r l swap-window -t +1
-
 # fixes redraw bugs
 set -g default-terminal screen-256color
 
-# splitting
-unbind %
-unbind '"'
-bind = split-window -h
-bind - split-window -v
-bind -r C-h run "tmux select-pane -L"
-bind -r C-j run "tmux select-pane -D"
-bind -r C-k run "tmux select-pane -U"
-bind -r C-l run "tmux select-pane -R"
-bind [ resize-pane -L 5
-bind ] resize-pane -R 5
-bind < resize-pane -D 5
-bind > resize-pane -U 5
-bind-key b command-prompt -p "create pane from:"  "join-pane -s ':%%'"
-bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 
 # window title
 set-option -g set-titles on
@@ -64,8 +38,7 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-bind-key z set -g status
-set-option -g status-utf8 on
+# set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
diff --git a/vimrc b/vimrc
index d492dd2..0f82b9c 100644
--- a/vimrc
+++ b/vimrc
@@ -146,7 +146,7 @@ Bundle 'ivyl/vim-bling'
 Bundle 'jmcantrell/vim-virtualenv'
 Bundle 'ervandew/supertab'
 " Bundle 'rstacruz/sparkup'
-Bundle 'scrooloose/syntastic'
+" Bundle 'scrooloose/syntastic'
 set statusline+=%#warningmsg#
 set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*