diff --git a/nvchad/.config/nvim/lua/chadrc.lua b/nvchad/.config/nvim/lua/chadrc.lua
index f36da9e..817c075 100644
--- a/nvchad/.config/nvim/lua/chadrc.lua
+++ b/nvchad/.config/nvim/lua/chadrc.lua
@@ -34,27 +34,31 @@ local function split_string(s)
 	return t
 end
 
-M.ui = {
-	theme = "gruvchad",
-	theme_toggle = { "gruvchad", "blossom_light" },
-
-	hl_override = highlights.override,
-	hl_add = highlights.add,
-
-	statusline = {
-		enabled = true,
-		theme = "vscode",
-	},
-
-	hl_override = {
-		NvDashAscii = { bg = "blue", fg = "white" },
-	},
-
-	nvdash = {
-		load_on_startup = true,
-		header = custom_logo,
-		width = 100,
-	},
+
+M = {
+  base46 = {
+    theme = "onenord",
+    theme_toggle = { "onenord", "blossom_light" },
+  },
+  ui = {
+    hl_override = highlights.override,
+    hl_add = highlights.add,
+
+    statusline = {
+      enabled = true,
+      theme = "vscode",
+    },
+
+    hl_override = {
+      NvDashAscii = { bg = "blue", fg = "white" },
+    },
+
+    nvdash = {
+      load_on_startup = true,
+      header = custom_logo,
+      width = 100,
+    },
+  }
 }
 
 return M
diff --git a/nvchad/.config/nvim/lua/configs/conform.lua b/nvchad/.config/nvim/lua/configs/conform.lua
index d590c66..3b40107 100644
--- a/nvchad/.config/nvim/lua/configs/conform.lua
+++ b/nvchad/.config/nvim/lua/configs/conform.lua
@@ -5,6 +5,9 @@ local options = {
 		-- Divine Intellect Languages
 		lua = { "stylua" },
 
+    -- based
+    scala = { "scalafmt" },
+
 		-- Web Dev shit
 		javascript = { "prettier" },
 		typescript = { "prettier" },