diff --git a/.config/ghostty/config b/.config/ghostty/config
index 9564223..b2a06c7 100644
--- a/.config/ghostty/config
+++ b/.config/ghostty/config
@@ -1,9 +1,14 @@
-theme = "everforest-dark"
+# theme = "everforest-dark"
+theme = "rose-pine-moon"
 
-font-size = 9
+font-size = 10
 font-family = "Maple Mono SemiBold"
 font-thicken = true
 
+background-opacity = 0.85
+background = 000000
+# background-opacity = 1
+# background-blur = false
 confirm-close-surface = false
 window-padding-x = 6
 window-padding-y = 6
@@ -12,4 +17,3 @@ mouse-hide-while-typing = true
 adjust-cell-height = 15%
 alpha-blending = linear-corrected
 bold-is-bright = true
-background-opacity = 1
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 2c82862..3a07fd9 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -5,17 +5,29 @@ end
 vim.opt.rtp:prepend(lazypath)
 require("lazy").setup({
 	spec = {
-		{ "sainnhe/everforest", 
+		{ "rose-pine/neovim", name = "rose-pine",
 			config = function()
-				vim.g.everforest_enable_italic = true
-				vim.g.everforest_transparent_background = 2
-				vim.cmd.colorscheme('everforest')
+				-- require("rose-pine").setup({
+				-- 	highlight_groups = {
+				-- 		CurSearch = { fg = "base", bg = "leaf", inherit = false },
+				-- 		Search = { fg = "text", bg = "leaf", blend = 20, inherit = false },
+				-- 		TelescopeNormal = { bg = "none" },
+				-- 		TelescopeBorder = { fg = "highlight_high", bg = "none" },
+				-- 		TelescopePromptNormal = { bg = "base" },
+				-- 		TelescopeResultsNormal = { fg = "subtle", bg = "none" },
+				-- 		TelescopeSelection = { fg = "text", bg = "base" },
+				-- 		TelescopeSelectionCaret = { fg = "rose", bg = "rose" },
+				-- 	},
+				-- })
+				vim.cmd.colorscheme("rose-pine-moon")
 			end
 		},
+		{ "mbbill/undotree" },
 		{ "echasnovski/mini.pairs", version = '*' },
 		{ "ibhagwan/fzf-lua", dependencies = { "nvim-tree/nvim-web-devicons" } },
+		{ 'nvim-telescope/telescope.nvim', dependencies = { 'nvim-lua/plenary.nvim' } },
 		{ "saghen/blink.cmp", version = "v1.*", opts = {} },
-		{ dir = "/home/andrew/personal/Projects/Lua/Polydev/", opts = {
+		{ "DarthMooMancer/Polydev", opts = {
 			terminal = {
 				mode = "floating",
 			}
@@ -31,31 +43,6 @@ require("lazy").setup({
 	}
 })
 
-vim.g.mapleader = " "
-vim.opt.termguicolors = true
-vim.opt.number = true
-vim.opt.relativenumber = true
-vim.opt.wrap = false
-vim.opt.swapfile = false
-vim.opt.signcolumn = "yes"
-vim.opt.scrolloff = 8
-vim.opt.sidescrolloff = 8
-vim.opt.hlsearch = false
-vim.opt.completeopt = { "menuone", "noselect", "popup" }
-
-vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-vim.keymap.set("n", "<leader>ff", "ggVG=")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set('n', '<leader><leader>', ":FzfLua files<CR>")
-vim.keymap.set('n', '<leader>gh', ":FzfLua helptags<CR>")
-vim.keymap.set('n', '<leader>gg', ":FzfLua live_grep<CR>")
-vim.keymap.set('n', '<leader>xx', ":FzfLua diagnostics_workspace<CR>")
-vim.keymap.set('n', '<leader>po', ":PolydevOpen<CR>")
-vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
-vim.lsp.enable({ "lua_ls", "clangd" })
-
 require('mini.pairs').setup()
 require("fzf-lua").setup({
 	"border-fused",
@@ -66,10 +53,73 @@ require("fzf-lua").setup({
 		},
 	},
 	winopts = {
-		preview = {
-			wrap = true,
+		height           = 0.50,            -- window height
+		width            = 0.45,            -- window width
+		row              = 0.35,            -- window row position (0=top, 1=bottom)
+		col              = 0.50,            -- window col position (0=left, 1=right)
+		border           = "rounded",
+		-- Backdrop opacity, 0 is fully opaque, 100 is fully transparent (i.e. disabled)
+		backdrop         = 0,
+		-- title         = "Title",
+		-- title_pos     = "center",        -- 'left', 'center' or 'right'
+		-- title_flags   = false,           -- uncomment to disable title flags
+		fullscreen       = false,           -- start fullscreen?
+		-- enable treesitter highlighting for the main fzf window will only have
+		-- effect where grep like results are present, i.e. "file:line:col:text"
+		-- due to highlight color collisions will also override `fzf_colors`
+		-- set `fzf_colors=false` or `fzf_colors.hl=...` to override
+		treesitter       = {
+			enabled    = true,
+			fzf_colors = { ["hl"] = "-1:reverse", ["hl+"] = "-1:reverse" }
 		},
+		preview = {
+			-- default     = 'bat',           -- override the default previewer?
+			-- default uses the 'builtin' previewer
+			border         = "rounded",       -- preview border: accepts both `nvim_open_win`
+			-- and fzf values (e.g. "border-top", "none")
+			-- native fzf previewers (bat/cat/git/etc)
+			-- can also be set to `fun(winopts, metadata)`
+			wrap           = false,           -- preview line wrap (fzf's 'wrap|nowrap')
+			hidden         = true,           -- start preview hidden
+			vertical       = "down:45%",      -- up|down:size
+			horizontal     = "right:60%",     -- right|left:size
+			layout         = "flex",          -- horizontal|vertical|flex
+			flip_columns   = 100,             -- #cols to switch to horizontal on flex
+			-- Only used with the builtin previewer:
+			title          = true,            -- preview border title (file/buf)?
+			title_pos      = "center",        -- left|center|right, title alignment
+			scrollbar      = false,         -- `false` or string:'float|border'
+			-- float:  in-window floating border
+			-- border: in-border "block" marker
+			scrolloff      = -1,              -- float scrollbar offset from right
+			-- applies only when scrollbar = 'float'
+			delay          = 20,              -- delay(ms) displaying the preview
+			-- prevents lag on fast scrolling
+			winopts = {                       -- builtin previewer window options
+				number            = true,
+				relativenumber    = false,
+				cursorline        = true,
+				cursorlineopt     = "both",
+				cursorcolumn      = false,
+				signcolumn        = "no",
+				list              = false,
+				foldenable        = false,
+				foldmethod        = "manual",
+			},
+		},
+		on_create = function()
+			-- called once upon creation of the fzf main window
+			-- can be used to add custom fzf-lua mappings, e.g:
+			--   vim.keymap.set("t", "<C-j>", "<Down>", { silent = true, buffer = true })
+		end,
+		-- called once _after_ the fzf interface is closed
+		-- on_close = function() ... end
 	},
+	-- winopts = {
+	-- 	preview = {
+	-- 		wrap = true,
+	-- 	},
+	-- },
 	grep = {
 		rg_glob = true,
 		rg_glob_fn = function(query)
@@ -81,3 +131,43 @@ require("fzf-lua").setup({
 		formatter = "path.filename_first",
 	},
 })
+
+vim.g.mapleader = " "
+vim.opt.termguicolors = true
+vim.opt.number = true
+vim.opt.relativenumber = true
+vim.opt.wrap = false
+vim.opt.swapfile = false
+vim.opt.signcolumn = "yes"
+vim.opt.scrolloff = 8
+vim.opt.sidescrolloff = 8
+vim.opt.hlsearch = false
+vim.opt.completeopt = { "menuone", "noselect", "popup" }
+vim.g.netrw_browse_split = 0
+vim.g.netrw_banner = 0
+vim.g.netrw_winsize = 25
+vim.lsp.enable({ "lua_ls", "clangd" })
+vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" })
+vim.api.nvim_set_hl(0, "StatusLineTerm", { bg = "none" })
+vim.api.nvim_set_hl(0, "StatusLineNC", { bg = "none" })
+-- vim.api.nvim_set_hl(0, "TabLine", { bg = "none" })
+-- vim.api.nvim_set_hl(0, "TabLineFill", { bg = "none" })
+-- vim.api.nvim_set_hl(0, "TabLineSel", { bg = "none" })
+
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
+vim.keymap.set("n", "<leader>ff", "ggVG=")
+vim.keymap.set("n", "<C-u>", "<C-u>zz")
+vim.keymap.set("n", "<C-d>", "<C-d>zz")
+vim.keymap.set("x", "<leader>p", [["_dP]])
+vim.keymap.set('n', '<leader><leader>', ":FzfLua files<CR>")
+vim.keymap.set('n', '<leader>gh', ":FzfLua helptags<CR>")
+vim.keymap.set('n', '<leader>gg', ":FzfLua live_grep<CR>")
+vim.keymap.set('n', '<leader>xx', ":FzfLua diagnostics_workspace<CR>")
+vim.keymap.set('n', '<leader>po', ":PolydevOpen<CR>")
+vim.keymap.set('n', '<leader>gd', vim.lsp.buf.definition)
+vim.keymap.set("n", "<leader>gr", vim.lsp.buf.references)
+vim.keymap.set("n", "<leader>gR", vim.lsp.buf.rename)
+vim.keymap.set("n", "<leader>uu", ":UndotreeToggle<CR>")
diff --git a/.config/sway/bgs/rocky_beach.png b/.config/sway/bgs/rocky_beach.png
deleted file mode 100644
index bb72f2a..0000000
Binary files a/.config/sway/bgs/rocky_beach.png and /dev/null differ
diff --git a/.local/share/fonts/JetBrainsMono-Bold.ttf b/.local/share/fonts/JetBrainsMono-Bold.ttf
new file mode 100644
index 0000000..8c93043
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Bold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-BoldItalic.ttf b/.local/share/fonts/JetBrainsMono-BoldItalic.ttf
new file mode 100644
index 0000000..1ddf216
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-BoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-ExtraBold.ttf b/.local/share/fonts/JetBrainsMono-ExtraBold.ttf
new file mode 100644
index 0000000..435d7a7
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-ExtraBold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-ExtraBoldItalic.ttf b/.local/share/fonts/JetBrainsMono-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..79e616e
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-ExtraBoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-ExtraLight.ttf b/.local/share/fonts/JetBrainsMono-ExtraLight.ttf
new file mode 100644
index 0000000..c131cbf
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-ExtraLight.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-ExtraLightItalic.ttf b/.local/share/fonts/JetBrainsMono-ExtraLightItalic.ttf
new file mode 100644
index 0000000..a768985
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-ExtraLightItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-Italic.ttf b/.local/share/fonts/JetBrainsMono-Italic.ttf
new file mode 100644
index 0000000..ccc9d6a
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Italic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-Light.ttf b/.local/share/fonts/JetBrainsMono-Light.ttf
new file mode 100644
index 0000000..15f15a2
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Light.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-LightItalic.ttf b/.local/share/fonts/JetBrainsMono-LightItalic.ttf
new file mode 100644
index 0000000..506208f
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-LightItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-Medium.ttf b/.local/share/fonts/JetBrainsMono-Medium.ttf
new file mode 100644
index 0000000..9767115
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Medium.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-MediumItalic.ttf b/.local/share/fonts/JetBrainsMono-MediumItalic.ttf
new file mode 100644
index 0000000..415a9e3
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-MediumItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-Regular.ttf b/.local/share/fonts/JetBrainsMono-Regular.ttf
new file mode 100644
index 0000000..dff66cc
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Regular.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-SemiBold.ttf b/.local/share/fonts/JetBrainsMono-SemiBold.ttf
new file mode 100644
index 0000000..a70e69b
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-SemiBold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-SemiBoldItalic.ttf b/.local/share/fonts/JetBrainsMono-SemiBoldItalic.ttf
new file mode 100644
index 0000000..968602e
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-SemiBoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-Thin.ttf b/.local/share/fonts/JetBrainsMono-Thin.ttf
new file mode 100644
index 0000000..7dbe2ac
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-Thin.ttf differ
diff --git a/.local/share/fonts/JetBrainsMono-ThinItalic.ttf b/.local/share/fonts/JetBrainsMono-ThinItalic.ttf
new file mode 100644
index 0000000..c6ad6c2
Binary files /dev/null and b/.local/share/fonts/JetBrainsMono-ThinItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Bold.ttf b/.local/share/fonts/JetBrainsMonoNL-Bold.ttf
new file mode 100644
index 0000000..f78f84f
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Bold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-BoldItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-BoldItalic.ttf
new file mode 100644
index 0000000..9fb8c83
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-BoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-ExtraBold.ttf b/.local/share/fonts/JetBrainsMonoNL-ExtraBold.ttf
new file mode 100644
index 0000000..fe5be6a
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-ExtraBold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-ExtraBoldItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-ExtraBoldItalic.ttf
new file mode 100644
index 0000000..59fc980
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-ExtraBoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-ExtraLight.ttf b/.local/share/fonts/JetBrainsMonoNL-ExtraLight.ttf
new file mode 100644
index 0000000..6da7b75
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-ExtraLight.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-ExtraLightItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-ExtraLightItalic.ttf
new file mode 100644
index 0000000..5733efc
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-ExtraLightItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Italic.ttf b/.local/share/fonts/JetBrainsMonoNL-Italic.ttf
new file mode 100644
index 0000000..4e9c380
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Italic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Light.ttf b/.local/share/fonts/JetBrainsMonoNL-Light.ttf
new file mode 100644
index 0000000..0b79b0c
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Light.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-LightItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-LightItalic.ttf
new file mode 100644
index 0000000..b5e0842
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-LightItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Medium.ttf b/.local/share/fonts/JetBrainsMonoNL-Medium.ttf
new file mode 100644
index 0000000..1454372
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Medium.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-MediumItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-MediumItalic.ttf
new file mode 100644
index 0000000..8d63c6c
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-MediumItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Regular.ttf b/.local/share/fonts/JetBrainsMonoNL-Regular.ttf
new file mode 100644
index 0000000..70d2ec9
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Regular.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-SemiBold.ttf b/.local/share/fonts/JetBrainsMonoNL-SemiBold.ttf
new file mode 100644
index 0000000..ce60a88
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-SemiBold.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-SemiBoldItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-SemiBoldItalic.ttf
new file mode 100644
index 0000000..3b3f8f6
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-SemiBoldItalic.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-Thin.ttf b/.local/share/fonts/JetBrainsMonoNL-Thin.ttf
new file mode 100644
index 0000000..bea837e
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-Thin.ttf differ
diff --git a/.local/share/fonts/JetBrainsMonoNL-ThinItalic.ttf b/.local/share/fonts/JetBrainsMonoNL-ThinItalic.ttf
new file mode 100644
index 0000000..f0bfed7
Binary files /dev/null and b/.local/share/fonts/JetBrainsMonoNL-ThinItalic.ttf differ