diff --git a/lua/weeheavy/prefs.lua b/lua/weeheavy/prefs.lua
index 5b14e70..74c9eb7 100644
--- a/lua/weeheavy/prefs.lua
+++ b/lua/weeheavy/prefs.lua
@@ -1,24 +1,31 @@
 -- Preferences
 
 -- Set highlight on search
-vim.o.hlsearch = true
+vim.opt.hlsearch = true
+
+-- Incremental search, helps to find 'regex' for search
+vim.opt.incsearch = true
 
 -- Make line numbers default
---vim.wo.number = true
 vim.opt.number = true
 vim.opt.relativenumber = true
-vim.opt.signcolumn = "number"
+vim.opt.signcolumn = 'number'
+
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true -- indent using spaces instead of <Tab>
 
 -- Dynamic line numbers
 --vim.wo.relativenumber = true
 
 -- highlight columns
-vim.o.colorcolumn= '80,120'
+vim.opt.colorcolumn = '80,120'
 
 -- Sync clipboard between OS and Neovim.
 --  Remove this option if you want your OS clipboard to remain independent.
 --  See `:help 'clipboard'`
-vim.o.clipboard = 'unnamedplus'
+--vim.opt.clipboard = 'unnamedplus'
 
 -- Always keep this amount of lines above and below the cursor
 vim.opt.scrolloff = 5 
@@ -35,5 +42,11 @@ vim.wo.signcolumn = 'yes'
 
 -- Blink cursor in normal mode
 --vim.opt.guicursor = 'n:blinkon300-blinkwait200-blinkoff300'
---
-vim.o.wrap = false
+
+-- Disable word wrap, enable temporarily with `:set wrap` when needed
+vim.opt.wrap = false
+
+vim.opt.termguicolors = true
+vim.opt.background = 'dark' -- light, dark
+-- Themes: duskfox, tokyonight-night, tokyonight-storm, tokyonight-day, tokyonight-moon
+vim.cmd.colorscheme 'tokyonight-storm'