diff --git a/.config/nvim/lua/null/plugins/lsp.lua b/.config/nvim/lua/null/plugins/lsp.lua
index 06aaff5..f3cc10a 100644
--- a/.config/nvim/lua/null/plugins/lsp.lua
+++ b/.config/nvim/lua/null/plugins/lsp.lua
@@ -219,7 +219,7 @@ return {
                 cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(9999)),
                 single_file_support = false,
                 filetypes = { "kotlin" },
-                root_markers = { "build.gradle", "build.gradle.kts", "pom.xml" },
+                root_markers = { "settings.gradle", "settings.gradle.kts", "pom.xml", "build.gradle", "build.gradle.kts", "workspace.json" },
             }
             vim.lsp.enable("kotlin-lsp")
             --#endregion
diff --git a/bootstrap b/bootstrap
index 531dcb2..a51b1f1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+##region Sanity checks and "imports"
 [ $ZI_DOTFILES ] && {
 	. $ZI_DOTFILES/common
 } || {
@@ -21,9 +22,9 @@
 [ -d $ZI_DOTFILES ] || { >&2 echo "Invalid dotfiles path, please re-run pre-bootstrap!"; exit 1; }
 
 . $ZI_DOTFILES/bootstrap-pkgs
+##endregion
 
-# === Function and Variable ===
-
+##region Function and Variable
 is_package_exists() {
 	[ $(command -v "$1" | wc -l) -gt 0 ] && return 0 || return 1
 }
@@ -95,8 +96,7 @@ install_nix() {
 	is_package_exists nix && { echo "nix is already installed, skipping..."; return; }
 	curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install
 }
-
-# === Actual automation ===
+##endregion
 
 echo "Linking x* configs..."
 ln -si $ZI_DOTFILES/.config/xinitrc $HOME/.xinitrc
diff --git a/pre-bootstrap b/pre-bootstrap
index b7b5f31..92a0302 100755
--- a/pre-bootstrap
+++ b/pre-bootstrap
@@ -2,6 +2,7 @@
 
 . ./common
 
+##region Sanity checks
 [ "$1" = "-" ] || {
 	prompt 'Experimental script! Run it anyway? [y/N] ' || exit 1
 }
@@ -11,6 +12,7 @@
 	>&2 echo "Please 'cd' to the dotfiles directory before running the script."
 	exit 1
 }
+##endregion
 
 echo_info() {
 	echo "########################################################################"