diff --git a/.config/tdm/tdminit b/.config/tdm/tdminit
index b4cb77c..9d5d58b 100644
--- a/.config/tdm/tdminit
+++ b/.config/tdm/tdminit
@@ -25,7 +25,7 @@ TDMUI=tdm_text
 #linux_logo -L classic
 
 # Args passed along when calling startx
-#STARTXARGS=
+STARTXARGS="-- -keeptty"
 
 # Uncomment to start X without selecting a session
 #exec startx
diff --git a/.config/vim/vim_plug b/.config/vim/vim_plug
index 9627fa4..6f4599e 100644
--- a/.config/vim/vim_plug
+++ b/.config/vim/vim_plug
@@ -100,7 +100,9 @@ Plug 'dense-analysis/ale'
 " --- For rust
 Plug 'rust-lang/rust.vim'
 
-" Plug 'wakatime/vim-wakatime'
+Plug 'wakatime/vim-wakatime'
+
+Plug 'GutenYe/json5.vim'
 
 call plug#end()
 
diff --git a/.config/xprofile b/.config/xprofile
index a6d4ec0..3422df9 100644
--- a/.config/xprofile
+++ b/.config/xprofile
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
-
+else
 	export _JAVA_AWT_WM_NONREPARENTING=1
 
 	# Disable auto-dim/autolock/screen saver
@@ -26,7 +26,4 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	xrandr --newmode "960x540"   40.75  960 992 1088 1216  540 543 548 562 -hsync +vsync
 	xrandr --addmode VGA1 768x432
 	xrandr --addmode VGA1 960x540
-
-else
-
 fi
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index 75707fe..f3b2ea0 100644
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -1,10 +1,16 @@
 #!/bin/zsh
+# -- XDG
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CONFIG_HOME="$HOME/.config"
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	export JAVA_HOME="$HOME/.sdkman/candidates/java/current"
 else
 	export JAVA_HOME="/usr/lib/jvm/java-11-openjdk"
 fi
+
+# Android stuff
 export ANDROID_SDK_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk"
 export ANDROID_PREFS_ROOT="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk"
 export ANDROID_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android/Android/Sdk"
@@ -43,11 +49,12 @@ export MANPAGER="nvimpager"
 # export MANPAGER="/bin/sh -c \"col -b | vim --not-a-term -c 'set ft=man ts=8 nomod nolist noma' -\""
 
 # -- Wine problem workaround
-# - NOTE to self: this will prevent some games from launching
+# - NOTE to self: this will prevent some (probably wine issue) games from launching
+#   known workaround: install DXVK
 # export MESA_GL_VERSION_OVERRIDE=4.4
 # alternative workaround
-export MESA_GL_VERSION_OVERRIDE=4.2
-export MESA_GLSL_VERSION_OVERRIDE=420
+export MESA_GL_VERSION_OVERRIDE=4.6
+export MESA_GLSL_VERSION_OVERRIDE=460
 
 # -- SUDO - Deactivated by default (using DOAS now)
 # export SUDO_ASKPASS=/bin/rofi-askpass
@@ -55,11 +62,6 @@ export MESA_GLSL_VERSION_OVERRIDE=420
 #   export SUDO_ASKPASS="/bin/dmenu-askpass"
 # fi
 
-# -- XDG
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CONFIG_HOME="$HOME/.config"
-
 # cleaning up
 export PARALLEL_HOME="$XDG_CONFIG_HOME/parallel"
 export SCRIPTS="$HOME/.scripts"
diff --git a/.config/zsh/aliases b/.config/zsh/aliases
index e259a04..a848d59 100644
--- a/.config/zsh/aliases
+++ b/.config/zsh/aliases
@@ -5,7 +5,8 @@
 # alias doas='doas -- '
 
 #sudo + vim, yea imagine having that powe- nvm
-alias sudovim='sudoedit'
+# alias sudovim='sudoedit'
+alias sudovim='doasedit'
 
 #switch to pgsql user
 alias pg='doas -u postgres'
@@ -16,7 +17,8 @@ alias pg='doas -u postgres'
 #vim
 alias nano=nvim
 alias vim=nvim
-alias vimsudo='sudoedit /etc/sudoers'
+# alias vimsudo='sudoedit /etc/sudoers'
+alias vimsudo='doasedit /etc/sudoers'
 alias vi=nvim
 alias v=nvim