diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 5c47991..3c75609 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -37,6 +37,8 @@ function u
 	sudo pacman -Syu $argv 
 end
 
+set -gx EDITOR vim
+
 set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/afonso/.ghcup/bin $PATH # ghcup-env
 fish_add_path /home/afonso/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin
 fish_add_path $HOME/.local/bin 
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
index b8a4d8e..3987d4e 100644
--- a/.config/nvim/lua/mappings.lua
+++ b/.config/nvim/lua/mappings.lua
@@ -6,6 +6,7 @@ vim.opt.hlsearch = false
 vim.opt.smartindent = true
 vim.opt.wrap = false
 vim.g.mapleader = " "
+vim.opt.scrolloff = 10
 --TAB KEYBINDINGS
 local map = vim.api.nvim_set_keymap
 local opts = { noremap = true, silent = true }
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
index 5bc3165..0dce482 100644
--- a/.config/nvim/lua/plugins/lspconfig.lua
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -1,4 +1,11 @@
 
+local mason_lspconfig = require "mason-lspconfig"
+
+mason_lspconfig.setup({
+    ensure_installed = { "sumneko_lua", "rust_analyzer" , "texlab", "hls"},
+    automatic_installation = true
+})
+
 local opts = { noremap=true, silent=true }
 vim.keymap.set('n', '<space>e', vim.diagnostic.open_float, opts)
 vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts)
@@ -37,3 +44,15 @@ local on_attach = function(client, bufnr)
 	--	})
 end
 
+local lspconfig = require "lspconfig"
+
+mason_lspconfig.setup_handlers {
+
+    -- This is a default handler that will be called for each installed server (also for new servers that are installed during a session)
+  function (server_name)
+    lspconfig[server_name].setup {
+      on_attach = on_attach,
+      flags = lsp_flags,
+    }
+  end,
+}
diff --git a/.config/nvim/lua/plugins/mason-lspconfig.lua b/.config/nvim/lua/plugins/mason-lspconfig.lua
deleted file mode 100644
index dc461ef..0000000
--- a/.config/nvim/lua/plugins/mason-lspconfig.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local mason_lspconfig = require "mason-lspconfig"
-
-mason_lspconfig.setup({
-    ensure_installed = { "sumneko_lua", "rust_analyzer" , "texlab", "hls"},
-    automatic_installation = true
-})
-
-local lspconfig = require "lspconfig"
-
-mason_lspconfig.setup_handlers {
-
-    -- This is a default handler that will be called for each installed server (also for new servers that are installed during a session)
-  function (server_name)
-    lspconfig[server_name].setup {
-      on_attach = on_attach,
-      flags = lsp_flags,
-    }
-  end,
-}
diff --git a/.config/xmonad/xmonad.lhs b/.config/xmonad/xmonad.lhs
index c63a6b3..73a7380 100644
--- a/.config/xmonad/xmonad.lhs
+++ b/.config/xmonad/xmonad.lhs
@@ -225,6 +225,8 @@ Percent of screen to increment by when resizing panes
    , className =? "main" --> doFloat
    , className =? "Mailspring"  --> doShift (myWorkspaces !! 5)
    , className =? "Xmessage" --> doFloat
+   , title     =? "Steam - News" --> doFloat
+   , title     =? "Friends List" --> doFloat
    , isFullscreen -->  doFullFloat]
 \end{code}
 
diff --git a/.xinitrc b/.xinitrc
index 79a1370..bcdb852 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -52,4 +52,5 @@ setxkbmap -layout us,pt
 setxkbmap -option grp:win_space_toggle
 setxkbmap -option caps:escape
 xrandr --output DP-0 --primary --left-of HDMI-0
+xscreensaver -no-splash &
 /home/afonso/.local/bin/xmonad