diff --git a/BasicDesktop/Dockerfile b/BasicDesktop/Dockerfile
index d414fc639dfdc2228ccdaee8417ec8bb55e46d0b..8922558d2817b20c29f0bb4fe6bb53549742e17e 100644
--- a/BasicDesktop/Dockerfile
+++ b/BasicDesktop/Dockerfile
@@ -65,9 +65,8 @@ RUN mkdir /metauser_home_vanilla/Downloads && chown metauser:metauser /metauser_
 # Extra SW
 #RUN apt-get install libreoffice gimp -y
 
-# Shell for terminal
-COPY files/runshell.sh /bin/
-RUN chmod 755 /bin/runshell.sh
+# Terminator alternative terminal
+RUN apt-get install terminator -y
 
 
 #------------------------
diff --git a/BasicDesktop/files/home_metauser_.config/terminator/config b/BasicDesktop/files/home_metauser_.config/terminator/config
new file mode 100644
index 0000000000000000000000000000000000000000..56f53705dfc0a64e11db751c631c3183b323da5a
--- /dev/null
+++ b/BasicDesktop/files/home_metauser_.config/terminator/config
@@ -0,0 +1,25 @@
+[global_config]
+  title_transmit_bg_color = "#000000"
+  title_receive_bg_color = "#000000"
+  title_inactive_fg_color = "#ffffff"
+  title_inactive_bg_color = "#000000"
+  inactive_color_offset = 1.0
+[keybindings]
+  new_tab = <Primary>t
+  copy = <Primary>c
+  paste = <Primary>v
+[profiles]
+  [[default]]
+    icon_bell = False
+    cursor_color = "#aaaaaa"
+    foreground_color = "#f3f3f3"
+    scrollback_infinite = True
+[layouts]
+  [[default]]
+    [[[window0]]]
+      type = Window
+      parent = ""
+    [[[child1]]]
+      type = Terminal
+      parent = window0
+[plugins]
diff --git a/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-11/15029210353.desktop b/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-11/15029210353.desktop
index b6be6b438ce182a10fe9737400a81d2157e1139a..e84ca14adbc662217452e0cf5dcaa3a2f0055f20 100644
--- a/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-11/15029210353.desktop
+++ b/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-11/15029210353.desktop
@@ -1,13 +1,24 @@
 [Desktop Entry]
 Version=1.0
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+GenericName=Web Browser
+Keywords=Internet;WWW;Browser;Web;Explorer
+Exec=firefox %u
+Terminal=false
+X-MultipleArgs=false
 Type=Application
-Exec=exo-open --launch WebBrowser %u
-Icon=web-browser
+Icon=firefox
+Categories=GNOME;GTK;Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;x-scheme-handler/chrome;video/webm;application/x-xpinstall;
 StartupNotify=true
-Terminal=false
-Categories=Network;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
-Name=Web Browser
-Comment=Browse the web
-X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop
+Actions=new-window;new-private-window;
+X-XFCE-Source=file:///usr/share/applications/firefox.desktop
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=firefox -new-window
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=firefox -private-window
diff --git a/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-9/15029210341.desktop b/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-9/15029210341.desktop
index 25d9e41f3cdb97f8ded24af75d163dcf0e544b3d..9c8426033dda2ca8bc2183583106fdd28e37a9cd 100644
--- a/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-9/15029210341.desktop
+++ b/BasicDesktop/files/home_metauser_.config/xfce4/panel/launcher-9/15029210341.desktop
@@ -1,12 +1,18 @@
 [Desktop Entry]
-Version=1.0
+Name=Terminator
+Comment=Advanced terminal emulator
+TryExec=terminator
+Exec=terminator
+Icon=terminator
 Type=Application
-Exec=exo-open --launch TerminalEmulator
-Icon=utilities-terminal
+Categories=GNOME;GTK;Utility;TerminalEmulator;System;
 StartupNotify=true
-Terminal=false
-Categories=Utility;X-XFCE;X-Xfce-Toplevel;
-OnlyShowIn=XFCE;
-Name=Terminal Emulator
-Comment=Use the command line
-X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop
+X-Ubuntu-Gettext-Domain=terminator
+X-Ayatana-Desktop-Shortcuts=NewWindow;
+Keywords=terminal;shell;prompt;command;commandline;
+X-XFCE-Source=file:///usr/share/applications/terminator.desktop
+
+[NewWindow Shortcut Group]
+Name=Open a New Window
+Exec=terminator
+TargetEnvironment=Unity
diff --git a/BasicDesktop/files/home_metauser_.config/xfce4/terminal/terminalrc b/BasicDesktop/files/home_metauser_.config/xfce4/terminal/terminalrc
index 53e56d4700f8afea2104ad92b666728860038048..cd2711c3a97a5f24415eb0a17522a6899f10de32 100644
--- a/BasicDesktop/files/home_metauser_.config/xfce4/terminal/terminalrc
+++ b/BasicDesktop/files/home_metauser_.config/xfce4/terminal/terminalrc
@@ -17,7 +17,5 @@ MiscTabCloseMiddleClick=TRUE
 MiscTabPosition=GTK_POS_TOP
 MiscHighlightUrls=TRUE
 MiscScrollAlternateScreen=TRUE
-CustomCommand=/bin/runshell.sh
 DefaultWorkingDir=/metauser
-RunCustomCommand=TRUE
 
diff --git a/BasicDesktop/files/runshell.sh b/BasicDesktop/files/runshell.sh
deleted file mode 100644
index 032fcc3b82ae397127989aa4aff56b57efa22df6..0000000000000000000000000000000000000000
--- a/BasicDesktop/files/runshell.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-cd /home/metauser
-exec /bin/bash