diff --git a/fish/config.fish b/fish/config.fish
index 964ac89..58983da 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -1,11 +1,5 @@
-# deno config
-set -Ux DENO_INSTALL /home/t31m/.deno
-set -Ux PATH $DENO_INSTALL/bin $PATH
-
-# pipx
-if test (command -v pipx)
-    register-python-argcomplete --shell fish pipx | .
-end
+set -Ux PYENV_ROOT $HOME/.pyenv
+set -Ux fish_user_paths $PYENV_ROOT/bin $fish_user_paths
 
 # pyenv init
 if command -v pyenv 1>/dev/null 2>&1
diff --git a/fish/theme-t31m/envAWS.fish b/fish/theme-t31m/envAWS.fish
index 9666c78..d555a69 100644
--- a/fish/theme-t31m/envAWS.fish
+++ b/fish/theme-t31m/envAWS.fish
@@ -1,4 +1,4 @@
-# TWAICE AWS Credential Management for FiSH
+# AWS Credential Management for FiSH
 
 # TODO change your user
 set AWS_IAM_USER ""
@@ -24,19 +24,19 @@ function envAWS --description 'switch to different aws account environments (-)
 	switch $argv[1]
 	case dev
 		echo "switching to /refreshing dev"
-		aws-mfa --assume-role arn:aws:iam::$DEV_ACCOUNT_ID:role/Administrators --duration 43200 --role-session-name $AWS_IAM_USER
+		aws-mfa --assume-role arn:aws:iam::$DEV_ACCOUNT_ID:role/Administrator --duration 43200 --role-session-name $AWS_IAM_USER
 		getAWSenv
 	case stg
 		echo "switching to /refreshing staging"
-		aws-mfa --assume-role arn:aws:iam::$STG_ACCOUNT_ID:role/Administrators --duration 43200 --role-session-name $AWS_IAM_USER
+		aws-mfa --assume-role arn:aws:iam::$STG_ACCOUNT_ID:role/Administrator --duration 43200 --role-session-name $AWS_IAM_USER
 		getAWSenv
 	case prod
 		echo "switching to /refreshing prod"
-		aws-mfa --assume-role arn:aws:iam::$PROD_ACCOUNT_ID:role/Administrators --duration 3600 --role-session-name $AWS_IAM_USER
+		aws-mfa --assume-role arn:aws:iam::$PROD_ACCOUNT_ID:role/Administrator --duration 3600 --role-session-name $AWS_IAM_USER
 		getAWSenv
 	case ops
 		echo "switching to /refreshing ops"
-		aws-mfa --assume-role arn:aws:iam::$OPS_ACCOUNT_ID:role/Administrators --duration 3600 --role-session-name $AWS_IAM_USER
+		aws-mfa --assume-role arn:aws:iam::$OPS_ACCOUNT_ID:role/Administrator --duration 3600 --role-session-name $AWS_IAM_USER
 		getAWSenv
 	case '*'
 		echo "Wrong / Invalid Environment provided"
diff --git a/fish/theme-t31m/ssm_tunnel.fish b/fish/theme-t31m/ssm_tunnel.fish
index 6327493..09fc7a9 100644
--- a/fish/theme-t31m/ssm_tunnel.fish
+++ b/fish/theme-t31m/ssm_tunnel.fish
@@ -5,11 +5,6 @@ function ssm_tunnel --description 'access private AWS ressources via Bastion Hos
         return
     end
 
-    #if [ "$AWS_PROFILE" != "twaice-ops"* ]
-    #    echo "Switch to OPS ENV first"
-    #    return
-    #end
-
     # Get bastion host ID using it's name
     set INSTANCE_ID (aws ec2 describe-instances \
             --filter 'Name=tag:Name,Values=ops-infrastructure-bastion'\
diff --git a/fish/theme-t31m/t31m_prompt_right.fish b/fish/theme-t31m/t31m_prompt_right.fish
index 144d77c..6cde8ba 100644
--- a/fish/theme-t31m/t31m_prompt_right.fish
+++ b/fish/theme-t31m/t31m_prompt_right.fish
@@ -13,9 +13,9 @@ function t31m_prompt_right
 		end
 	end
 
-    printf '%s' \U231A
+  printf '%s' \U231A
 	printf (yellow)"("(off)(date +%H(yellow):(off)%M(yellow):(off)%S)(yellow)")"(off)
 	printf '%s' \U1F4C1
-    printf (yellow)"("(off)$cwd(yellow)")"(off)
+  printf (yellow)"("(off)$cwd(yellow)")"(off)
 
 end
diff --git a/fish_setup.sh b/fish_setup.sh
index aedea08..1a74f5a 100755
--- a/fish_setup.sh
+++ b/fish_setup.sh
@@ -3,7 +3,7 @@
 set -x
 
 # install nvm
-curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
 
 # install pyenv
 git clone https://github.com/pyenv/pyenv.git ~/.pyenv
diff --git a/main.sh b/main.sh
index 1d5998e..fc26221 100755
--- a/main.sh
+++ b/main.sh
@@ -21,9 +21,4 @@ chmod +x /usr/local/bin/docker-compose
 
 usermod -aG docker t31m
 
-curl -sL -o ~/usr/local/bin/conky-x86_64.AppImage \
-    $(curl -sL https://api.github.com/repos/brndnmtthws/conky/releases/latest | \
-    jq --raw-output '.assets[0] | .browser_download_url')
-chmod +x /usr/local/bin/conky-x86_64.AppImage
-
 echo "Initial Setup Complete. Please run fish_setup.sh for env setup"