diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index eca0a43..40b0f89 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -11,6 +11,7 @@ export PAGER="bat"
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
+export ANDROID_HOME="$HOME/Android/Sdk"
 
 export GOPATH="$XDG_DATA_HOME/go"
 export ANDROID_HOME="/home/tsousa/Android/Sdk/"
@@ -34,25 +35,9 @@ fish_add_path $HOME/.local/share/nvim/mason/bin/
 fish_add_path $HOME/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin
 fish_add_path $HOME/.cargo/bin/
 fish_add_path $HOME/.config/emacs/bin
+
 fish_add_path $ANDROID_HOME/emulator
 fish_add_path $ANDROID_HOME/platform-tools
 fish_add_path $ANDROID_HOME/cmdline-tools/latest/bin
 
 starship init fish | source
-
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-if test -f /home/tsousa/.miniforge3/bin/conda
-    eval /home/tsousa/.miniforge3/bin/conda "shell.fish" "hook" $argv | source
-else
-    if test -f "/home/tsousa/.miniforge3/etc/fish/conf.d/conda.fish"
-        . "/home/tsousa/.miniforge3/etc/fish/conf.d/conda.fish"
-    else
-        set -x PATH "/home/tsousa/.miniforge3/bin" $PATH
-    end
-end
-
-if test -f "/home/tsousa/.miniforge3/etc/fish/conf.d/mamba.fish"
-    source "/home/tsousa/.miniforge3/etc/fish/conf.d/mamba.fish"
-end
-# <<< conda initialize <<<
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 01a0c1d..12fc5cd 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -39,4 +39,4 @@ SETUVAR fish_pager_color_selected_background:\x1d
 SETUVAR fish_pager_color_selected_completion:\x1d
 SETUVAR fish_pager_color_selected_description:\x1d
 SETUVAR fish_pager_color_selected_prefix:\x1d
-SETUVAR fish_user_paths:/opt/google\x2dcloud\x2dcli/bin\x1e/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2erustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin
+SETUVAR fish_user_paths:/home/tsousa/Android/Sdk/platform\x2dtools\x1e/home/tsousa/Android/Sdk/emulator\x1e/home/tsousa/Android/Sdk/cmdline\x2dtools/latest/bin\x1e/opt/google\x2dcloud\x2dcli/bin\x1e/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2erustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin
diff --git a/.config/keymap/evdev.xml b/.config/keymap/evdev.xml
new file mode 100644
index 0000000..63edbc7
--- /dev/null
+++ b/.config/keymap/evdev.xml
@@ -0,0 +1,15 @@
+    <layout>
+      <configItem>
+        <!-- Keyboard indicator for custom layouts -->
+        <name>prog</name>
+        <shortDescription>en</shortDescription>
+        <description>English (US,prog modded symbols)</description>
+        <countryList>
+          <iso3166Id>US</iso3166Id>
+        </countryList>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
+      </configItem>
+    </layout>
+
diff --git a/.config/keymap/prog b/.config/keymap/prog
new file mode 100644
index 0000000..af1051b
--- /dev/null
+++ b/.config/keymap/prog
@@ -0,0 +1,58 @@
+default partial alphanumeric_keys modifier_keys
+xkb_symbols "prog" {
+
+    name[Group1]= "English (prog modded symbols)";
+
+    key <TLDE>	{[   grave,	 asciitilde	]};
+    key <AE01>	{[	 asciicircum,	 1		]};
+    key <AE02>	{[	 bracketleft,	 2		]};
+    key <AE03>	{[	 braceleft,	 3	]};
+    key <AE04>	{[	 parenleft,	 4		]};
+    key <AE05>	{[	 percent,	 5	]};
+    key <AE06>	{[	 asterisk,	 6	]};
+    key <AE07>	{[	 parenright,	 7	]};
+    key <AE08>	{[	 braceright,	 8	]};
+    key <AE09>	{[	 bracketright,	 9	]};
+    key <AE10>	{[	 dollar,	 0	]};
+    key <AE11>	{[   minus,	 underscore	]};
+    key <AE12>	{[   equal,	 plus		]};
+
+
+    key <AD01>	{[	 q,	 Q		]};
+    key <AD02>	{[	 w,	 W		]};
+    key <AD03>	{[	 e,	 E		]};
+    key <AD04>	{[	 r,	 R		]};
+    key <AD05>	{[	 t,	 T		]};
+    key <AD06>	{[	 y,	 Y		]};
+    key <AD07>	{[	 u,	 U		]};
+    key <AD08>	{[	 i,	 I		]};
+    key <AD09>	{[	 o,	 O		]};
+    key <AD10>	{[	 p,	 P		]};
+    key <AD11>	{[ at,	 exclam	]};
+    key <AD12>	{[ numbersign, ampersand	]};
+
+    key <AC01>	{[	 a,	 A		]};
+    key <AC02>	{[	 s,	 S		]};
+    key <AC03>	{[	 d,	 D		]};
+    key <AC04>	{[	 f,	 F		]};
+    key <AC05>	{[	 g,	 G		]};
+    key <AC06>	{[	 h,	 H		]};
+    key <AC07>	{[	 j,	 J		]};
+    key <AC08>	{[	 k,	 K		]};
+    key <AC09>	{[	 l,	 L		]};
+    key <AC10>	{[ semicolon,	 colon		]};
+    key <AC11>	{[ apostrophe,	 quotedbl	]};
+    key <BKSL>	{[ backslash,	 bar		]};
+
+    key <AB01>	{[	 z,	 Z		]};
+    key <AB02>	{[	 x,	 X		]};
+    key <AB03>	{[	 c,	 C		]};
+    key <AB04>	{[	 v,	 V		]};
+    key <AB05>	{[	 b,	 B		]};
+    key <AB06>	{[	 n,	 N		]};
+    key <AB07>	{[	 m,	 M		]};
+    key <AB08>	{[   comma,	 less		]};
+    key <AB09>	{[  period,	 greater	]};
+    key <AB10>	{[   slash,	 question	]};
+};
+
diff --git a/.xinitrc b/.xinitrc
index 5e6c486..871f21e 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -36,7 +36,7 @@ if [ -f /usr/bin/prime-offload ]; then
 	/usr/bin/prime-offload
 fi
 
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+/usr/lib/xfce-polkit/xfce-polkit &
 /usr/bin/xscreensaver -no-splash &
 # setup monitors (laptop only)
 if [ -f /usr/bin/envycontrol ]; then