diff --git a/.bashrc.kuba b/.bashrc.kuba
index dece0d1..5e690dc 100755
--- a/.bashrc.kuba
+++ b/.bashrc.kuba
@@ -13,8 +13,6 @@ alias ls='ls --color=auto'
 export KRB5_CONFIG=".etcfiles/krb5.conf"
 export EDITOR="vim"
 export CUPS_GSSSERVICENAME=HTTP
-export PATH=$PATH:/home/kuba/bin
-export PATH="$HOME/git/esp-open-sdk/xtensa-lx106-elf/bin/:$PATH"
 
 alias dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles.git --work-tree=$HOME"
 alias dvim="GIT_WORK_TREE='/home/kuba' GIT_DIR='/home/kuba/.dotfiles.git/' vim"
@@ -27,7 +25,7 @@ source_existing ~/.bash_prompt.kuba
 source_existing /usr/share/lmod/lmod/init/profile
 if [ -e /usr/share/lmod/lmod/init/profile ]; then
    module use "$HOME/.modules.kuba/"
-   module load python-wrap
+   module load python-wrap/3
 fi
 
 case $hostname in
diff --git a/.modules.kuba/python-wrap.lua b/.modules.kuba/python-wrap.lua
deleted file mode 100644
index c54324f..0000000
--- a/.modules.kuba/python-wrap.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-local name    = myModuleName()
-local version = myModuleVersion()
-local wrapdir = pathJoin("/tmp", name .. version .. '_kuba')
-
-prepend_path("PATH", wrapdir)
-execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
-execute {cmd='ln -s /usr/bin/python3 ' .. pathJoin(wrapdir, "python") .. ' 2>/dev/null', modeA={"load"}}
-execute {cmd='ln -s /usr/bin/pip3 '     .. pathJoin(wrapdir, "pip") .. ' 2>/dev/null', modeA={"load"}}
diff --git a/.modules.kuba/python-wrap/3.6.lua b/.modules.kuba/python-wrap/3.6.lua
new file mode 100644
index 0000000..2bad216
--- /dev/null
+++ b/.modules.kuba/python-wrap/3.6.lua
@@ -0,0 +1,10 @@
+local name    = myModuleName()
+local version = myModuleVersion()
+local wrapdir = pathJoin("/tmp", name .. version .. '_kuba')
+
+prepend_path("PATH", wrapdir)
+execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
+execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python3") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/pip'    .. version .. ' ' .. pathJoin(wrapdir, "pip3") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/pip'    .. version .. ' ' .. pathJoin(wrapdir, "pip") .. ' 2>/dev/null', modeA={"load"}}
diff --git a/.modules.kuba/python-wrap/3.7.lua b/.modules.kuba/python-wrap/3.7.lua
new file mode 100644
index 0000000..2bad216
--- /dev/null
+++ b/.modules.kuba/python-wrap/3.7.lua
@@ -0,0 +1,10 @@
+local name    = myModuleName()
+local version = myModuleVersion()
+local wrapdir = pathJoin("/tmp", name .. version .. '_kuba')
+
+prepend_path("PATH", wrapdir)
+execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
+execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python3") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/pip'    .. version .. ' ' .. pathJoin(wrapdir, "pip3") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/pip'    .. version .. ' ' .. pathJoin(wrapdir, "pip") .. ' 2>/dev/null', modeA={"load"}}
diff --git a/.modules.kuba/python-wrap/3.lua b/.modules.kuba/python-wrap/3.lua
new file mode 100644
index 0000000..2b0eca1
--- /dev/null
+++ b/.modules.kuba/python-wrap/3.lua
@@ -0,0 +1,8 @@
+local name    = myModuleName()
+local version = myModuleVersion()
+local wrapdir = pathJoin("/tmp", name .. version .. '_kuba')
+
+prepend_path("PATH", wrapdir)
+execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
+execute {cmd='ln -s /usr/bin/python' .. version .. ' ' .. pathJoin(wrapdir, "python") .. ' 2>/dev/null', modeA={"load"}}
+execute {cmd='ln -s /usr/bin/pip'    .. version .. ' ' .. pathJoin(wrapdir, "pip") .. ' 2>/dev/null', modeA={"load"}}
diff --git a/.ssh/config b/.ssh/config
index 79d06ef..50860ea 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -12,6 +12,7 @@ Host tahoe
   HostName tahoe.fy.chalmers.se
   User jakub
   Port 22209
+  ForwardX11 yes
   ForwardX11Trusted yes
 
 Host geym