diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 7b9038b..32765b0 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -20,10 +20,4 @@
 --        null2264's NeoVim Config        --
 --========================================--
 
--- TODO: Uncomment once we done migrating
--- require("null")
-
--- FIXME: Turn all these to LUA
-vim.cmd("source ~/.config/vim/vim_nix")
-vim.cmd("source ~/.config/vim/vim_uni")
-vim.cmd("source ~/.config/vim/vim_plug")
+require("null")
diff --git a/.config/nvim/lua/null/config.lua b/.config/nvim/lua/null/config.lua
index beec70f..98a7838 100644
--- a/.config/nvim/lua/null/config.lua
+++ b/.config/nvim/lua/null/config.lua
@@ -3,14 +3,22 @@ local g = vim.g
 
 o.encoding = "utf-8"
 o.hls = true
-o.nu = true
+
+o.number = true
 o.relativenumber = true
+o.cursorline = true
+o.cursorlineopt = "number"
+
 o.ignorecase = true
 o.smartcase = true
 o.mouse = "a"
 o.splitbelow = true
 o.splitright = true
 
+-- Remove ugly tilde at the end of a file
+-- REF: https://vi.stackexchange.com/a/29181
+o.fillchars = "eob: "
+
 g.mapleader = " "
 g.guifont = { "Sarasa UI J", ":h16" }
 
diff --git a/.config/nvim/lua/null/plugins/init.lua b/.config/nvim/lua/null/plugins/init.lua
index 0bcb736..d0a516e 100644
--- a/.config/nvim/lua/null/plugins/init.lua
+++ b/.config/nvim/lua/null/plugins/init.lua
@@ -6,8 +6,17 @@ return {
 		lazy = false,
 		priority = 1000,
 		config = function ()
-			-- load the colorscheme here
-			vim.cmd([[colorscheme tokyonight]])
+			require("tokyonight").setup({
+				style = "moon",
+				transparent = true,
+				styles = {
+					sidebars = "transparent"
+				},
+				on_highlights = function (hl, c)
+					hl.CursorLineNr = { fg = c.yellow, bold = true }
+				end,
+			})
+			vim.cmd([[colorscheme tokyonight-moon]])
 		end,
 	},
 	{