diff --git a/Dockerfile b/Dockerfile
index 0930033..242fe05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,11 +54,11 @@ pciutils \
 xz-utils \
 glibc-tools \
 python3-pip \
-fonts-firacode \
 fonts-powerline \
 build-essential \
 ca-certificates \
 libarchive-tools \
+neofetch \
 "
 
 # Install Apt Packages
@@ -81,6 +81,7 @@ RUN set -ex \
         /root/.cache \
         /var/tmp/* \
         /tmp/* \
+    && neofetch \
     && true
 
 # Create User: vscode
@@ -129,12 +130,12 @@ RUN set -ex \
     && rm install \
     && true
 
-# Install NerdFonts FiraCode
+# Install NerdFonts FiraCode Nerd Font Mono
 RUN set -ex \
     && sudo mkdir -p /usr/share/fonts \
-    && curl --output /tmp/FiraCode.zip -L https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/FiraCode.zip \
-    && sudo unzip /tmp/FiraCode.zip -d /usr/share/fonts/NerdFonts \
-    && rm -rf /tmp/FiraCode.zip \
+    && curl --output /tmp/FiraMono.zip -L https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/FiraMono.zip \
+    && sudo unzip /tmp/FiraMono.zip -d /usr/share/fonts/NerdFonts \
+    && rm -rf /tmp/FiraMono.zip \
     && true
 
 #################################################################################
@@ -428,13 +429,13 @@ RUN set -ex \
     && /bin/ttyd --version \
     && true
 
-# Install screenfetch
-RUN set -ex \
-    && export varUrlScreenfetch="https://git.io/vaHfR" \
-    && sudo curl --output /usr/bin/screenfetch -L ${varUrlScreenfetch} \
-    && sudo chmod +x /usr/bin/screenfetch \
-    && /usr/bin/screenfetch \
-    && true
+## Install screenfetch
+#RUN set -ex \
+#    && export varUrlScreenfetch="https://git.io/vaHfR" \
+#    && sudo curl --output /usr/bin/screenfetch -L ${varUrlScreenfetch} \
+#    && sudo chmod +x /usr/bin/screenfetch \
+#    && /usr/bin/screenfetch \
+#    && true
 
 #################################################################################
 # VSCode Server Configuration
diff --git a/devcontainer.json b/devcontainer.json
index 29442c8..7ed91ad 100644
--- a/devcontainer.json
+++ b/devcontainer.json
@@ -11,7 +11,6 @@
         "go.testTags", "all",
         "go.buildTags", "all",
         "editor.minimap.enabled", false,
-        "explorer.openEditors.visible", 1,
         "editor.quickSuggestionsDelay", 0,
         "editor.suggestSelection", "first",
         "editor.snippetSuggestions", "top",
@@ -20,7 +19,11 @@
         "editor.gotoLocation.multipleDeclarations", "goto",
         "editor.gotoLocation.multipleImplementations", "goto",
         "editor.gotoLocation.multipleTypeDefinitions", "goto",
-        "editor.terminal.integrated.shell.linux", "/usr/bin/zsh",
+        "editor.terminal.integrated.shell.linux", "/usr/bin/fish",
+        "terminal.integrated.sendKeybindingsToShell": true,
+        "terminal.integrated.fontFamily": "FiraCode Nerd Font Mono",
+        "workbench.colorTheme": "GitHub Dark",
+        "explorer.openEditors.visible", 1,
         "files.trimTrailingWhitespace", true,
         "files.trimFinalNewlines", true
       ],