diff --git a/home-manager/modules/neovim.nix b/home-manager/modules/neovim.nix
index 7a221cf..7145d98 100644
--- a/home-manager/modules/neovim.nix
+++ b/home-manager/modules/neovim.nix
@@ -1,7 +1,17 @@
 { pkgs, ... }: {
   programs.vim = {
     enable = true;
-    plugins = with pkgs.vimPlugins; [ vim-airline neoformat vim-monokai ];
+    plugins = with pkgs.vimPlugins; [
+
+      # Nice statusbar at the bottom
+      vim-airline
+
+      # Autoformatter for 'all' languages
+      neoformat
+
+      # Colorscheme
+      vim-monokai
+    ];
     settings = { ignorecase = true; };
     extraConfig = ''
       set mouse=a
diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix
index 4290670..43801d2 100644
--- a/home-manager/modules/vscode.nix
+++ b/home-manager/modules/vscode.nix
@@ -4,10 +4,20 @@
     enable = true;
     package = pkgs.vscodium; # You can skip this if you want to use the unfree version
     extensions = with pkgs.vscode-extensions; [
+      # Dark Theme
       dracula-theme.theme-dracula
-      vscodevim.vim
-      yzhang.markdown-all-in-one
+
+      # Terraform and HCL support
+      hashicorp.terraform
+      
+      # Python
       ms-python.python
+
+      # Vim 
+      vscodevim.vim
+
+      # Markdown highlighting/formatting/preview
+      yzhang.markdown-all-in-one
     ];
   };
 }