diff --git a/nvim/ftplugin/swift.lua b/nvim/ftplugin/swift.lua
new file mode 100644
index 0000000..5ff1628
--- /dev/null
+++ b/nvim/ftplugin/swift.lua
@@ -0,0 +1,5 @@
+local o = vim.opt
+
+o.tabstop = 2
+o.softtabstop = 2
+o.shiftwidth = 2
diff --git a/nvim/lua/autocmd.lua b/nvim/lua/autocmd.lua
index e22ed44..88dd294 100644
--- a/nvim/lua/autocmd.lua
+++ b/nvim/lua/autocmd.lua
@@ -13,3 +13,4 @@ vim.api.nvim_exec([[
     au FileType * setlocal formatoptions-=c formatoptions-=r formatoptions-=o
   augroup END
   ]], false)
+
diff --git a/nvim/lua/config/nightfox.lua b/nvim/lua/config/nightfox.lua
index 8fa783e..f79de10 100644
--- a/nvim/lua/config/nightfox.lua
+++ b/nvim/lua/config/nightfox.lua
@@ -3,7 +3,7 @@ local nightfox = require('nightfox')
 -- This function set the configuration of nightfox. If a value is not passed in the setup function
 -- it will be taken from the default configuration above
 nightfox.setup({
-  fox = "nordfox", -- change the colorscheme to use nordfox
+  fox = "terafox", -- change the colorscheme to use terafox
   styles = {
     comments = "italic", -- change style of comments to be italic
     keywords = "bold", -- change style of keywords to be bold
@@ -13,8 +13,8 @@ nightfox.setup({
     match_paren = true, -- inverse the highlighting of match_parens
   },
   colors = {
-    red = "#FF000", -- Override the red color for MAX POWER
-    bg_alt = "#000000",
+    --red = "#FF000", -- Override the red color for MAX POWER
+    --bg_alt = "#000000",
   },
   hlgroups = {
     TSPunctDelimiter = { fg = "${red}" }, -- Override a highlight group with the color red
@@ -24,3 +24,4 @@ nightfox.setup({
 
 -- Load the configuration set above and apply the colorscheme
 nightfox.load()
+vim.cmd("colorscheme terafox")
diff --git a/nvim/lua/config/nvim-tree.lua b/nvim/lua/config/nvim-tree.lua
index 81d5147..1575488 100644
--- a/nvim/lua/config/nvim-tree.lua
+++ b/nvim/lua/config/nvim-tree.lua
@@ -98,7 +98,7 @@ require("nvim-tree").setup {
                 {key = {"<CR>", "o", "<2-LeftMouse>"}, cb = tree_cb("edit")},
                 {key = {"<2-RightMouse>", "<C-]>"}, cb = tree_cb("cd")},
                 {key = "<C-v>", cb = tree_cb("vsplit")},
-                {key = "<C-x>", cb = tree_cb("split")},
+                {key = "<C-s>", cb = tree_cb("split")},
                 {key = "<C-t>", cb = tree_cb("tabnew")},
                 {key = "<", cb = tree_cb("prev_sibling")},
                 {key = ">", cb = tree_cb("next_sibling")},
diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua
index 55d0e62..ec7b715 100644
--- a/nvim/lua/mappings.lua
+++ b/nvim/lua/mappings.lua
@@ -30,3 +30,6 @@ keymap("n", "<Down>", ":resize +1<CR>", default_options)
 -- Move selected line / block of text in visual mode
 keymap("x", "K", ":move '<-2<CR>gv-gv", default_options)
 keymap("x", "J", ":move '>+1<CR>gv-gv", default_options)
+
+-- Toggle nvim-tree open or closed
+keymap("n", "<c-n>", "<CMD>NvimTreeToggle<CR>", default_options)
diff --git a/nvim/lua/settings.lua b/nvim/lua/settings.lua
index 7826dc0..91052be 100644
--- a/nvim/lua/settings.lua
+++ b/nvim/lua/settings.lua
@@ -2,14 +2,17 @@ local o = vim.opt
 local wo = vim.wo
 local fn = vim.fn
 
-vim.cmd "filetype indent plugin on"
-vim.cmd "set inccommand=split"
+-- vim.cmd.filetype('on')
+-- vim.cmd.filetype.plugin('on')
+-- vim.cmd.filetype.indent('on')
+-- vim.cmd.filetype('indent plugin on')
+vim.cmd.set('inccommand=split')
 -- o.guicursor = "n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50" -- block in normal and beam cursor in insert mode
 o.updatetime = 300 -- faster completion
 o.timeoutlen = 400 -- time to wait for a mapped sequence to complete (in milliseconds)
 o.ttimeoutlen = 0 -- Time in milliseconds to wait for a key code sequence to complete
 o.backup = false -- creates a backup file
-o.swapfile = true -- enable/disable swap file creation
+o.swapfile = false -- enable/disable swap file creation
 o.dir = fn.stdpath("data") .. "/swp" -- swap file directory
 o.undofile = true -- enable/disable undo file creation
 o.undodir = fn.stdpath("data") .. "/undodir" -- set undo directory
@@ -28,7 +31,9 @@ o.smartcase = true -- smart case
 o.smartindent = true -- make indenting smarter again
 o.splitbelow = true -- force all horizontal splits to go below current window
 o.splitright = true -- force all vertical splits to go to the right of current window
+o.autoindent = true -- turn on auto indent.
 o.expandtab = true -- convert tabs to spaces
+o.smarttab = true -- turn on smart tab
 o.shiftwidth = 2 -- the number of spaces inserted for each indentation
 o.tabstop = 2 -- how many columns a tab counts for
 o.termguicolors = true -- set term gui colors (most terminals support this)
diff --git a/nvim/lua/theme.lua b/nvim/lua/theme.lua
index 941a7bd..8c04653 100644
--- a/nvim/lua/theme.lua
+++ b/nvim/lua/theme.lua
@@ -1,3 +1,5 @@
 -- Nightfox
-require('nightfox').load('nordfox')
+require('nightfox').load('terafox')
+--require('nightfox').load('terafox')
+--vim.cmd("colorscheme nightfox")
 
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a42191b..ee84651 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -13,6 +13,12 @@ set-option -sa terminal-overrides ",xterm*:Tc"
 # Change the default $TERM to tmux-256color
 set -g default-terminal "xterm-256color"
 
+# Change windows to start with an index of 1 instead of 0
+set -g base-index 1
+
+# Change panes to start with an index of 1 instead of 0
+setw -g pane-base-index 1
+
 # No bells at all
 set -g bell-action none