diff --git a/.devcontainer/src/Dockerfile b/.devcontainer/src/Dockerfile
index e9fae98..9a49d20 100644
--- a/.devcontainer/src/Dockerfile
+++ b/.devcontainer/src/Dockerfile
@@ -30,7 +30,9 @@ RUN \
         # Terminal tools
         command-not-found \
         fzf \
+        neovim \
         # screen \
+        thefuck \
         # tmux \
     # Move first run notice to right spot
     && mkdir -p "/usr/local/etc/vscode-dev-containers/" \
diff --git a/.devcontainer/src/devcontainer.json b/.devcontainer/src/devcontainer.json
index 9165141..0ae6ba8 100644
--- a/.devcontainer/src/devcontainer.json
+++ b/.devcontainer/src/devcontainer.json
@@ -14,7 +14,7 @@
     "ghcr.io/jpawlowski/devcontainer-features/powershell-extended:2": {
       "version": "7.4",
       "repositories": "PSGallery",
-      "resources": "Az@[12.2,12.3); EntraExporter@[2.0,2.1); ExchangeOnlineManagement@[3.5,3.6); Microsoft.Graph@[2.22,2.23); Microsoft.Graph.Entra@[0.12-preview,1.1); MicrosoftTeams@[6.5,6.6); Microsoft.PowerShell.Crescendo@[1.1,1.2); PSScriptTools@[2.50,2.51); Microsoft.PowerShell.SecretManagement@[1.1,1.2); Microsoft.PowerShell.SecretStore@[1.0,1.1); Microsoft.PowerShell.TextUtility@[0.1,1.1)",
+      "resources": "Az@[12.2,12.3); EntraExporter@[2.0,2.1); ExchangeOnlineManagement@[3.5,3.6); Microsoft.Graph@[2.22,2.23); Microsoft.Graph.Entra@[0.12-preview,1.1); MicrosoftTeams@[6.5,6.6); Microsoft.PowerShell.Crescendo@[1.1,1.2); PSScriptTools@[2.50,2.51); PSFunctionTools@[1.2,1.3); Microsoft.PowerShell.SecretManagement@[1.1,1.2); Microsoft.PowerShell.SecretStore@[1.0,1.1); Microsoft.PowerShell.TextUtility@[0.1,1.1)",
       "installOhMyPosh": "true",
       "installOhMyPoshConfig": "true",
       "psConfigExperimentalFeatures": "PSCommandNotFoundSuggestion; PSFeedbackProvider; PSSubsystemPluginModel"
diff --git a/.devcontainer/src/first-run-notice.txt b/.devcontainer/src/first-run-notice.txt
index 79f04bb..386cff1 100644
--- a/.devcontainer/src/first-run-notice.txt
+++ b/.devcontainer/src/first-run-notice.txt
@@ -1,4 +1,4 @@
 👋 Welcome to your Admin Container for Microsoft 365!
 
-🔍 To explore VS Code to its fullest, search using the Command Palette (Cmd/Ctrl + Shift + P or F1).
+🦄 For enhanced experience, follow the \e]8;;https://github.com/microsoft/cascadia-code/releases\aEnhancement Guide\e]8;;\a.
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index df9708e..26db242 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,5 @@
 {
   "files.defaultLanguage": "powershell",
-  "powershell.integratedConsole.focusConsoleOnExecute": false,
-  "powershell.integratedConsole.showOnStartup": false,
   "terminal.integrated.defaultProfile.linux": "bash",
   "terminal.integrated.defaultProfile.osx": "bash"
 }
\ No newline at end of file