diff --git a/dotfiles/ros.bash b/dotfiles/ros.bash
index 9c0b7463690b4b9e76b9516c5ee3e4cc05c1d827..7e25f21b41c78d4a9d81c5f64054cf0c8651f8ac 100644
--- a/dotfiles/ros.bash
+++ b/dotfiles/ros.bash
@@ -1,29 +1,44 @@
 ###################################################################
-# ROS
+# ROS aliases and functions
 ###################################################################
 
+# Define ROS_DISTRO before source ROS
 if [ -z $ROS_DISTRO ]; then export ROS_DISTRO=noetic; fi
 
+# Determine shell extension
 if [ -z $SHELL ]; then echo "SHELL not set"; else ext=$(basename ${SHELL}); fi
 
 # Source rosmon
 function smon(){
-	source /opt/ros/${ROS_DISTRO}/etc/catkin/profile.d/50-rosmon.${ext}
+    source /opt/ros/${ROS_DISTRO}/etc/catkin/profile.d/50-rosmon.${ext}
+}
+
+# cd to the root of the workspace
+function roshome(){
+    roscd && cd ..
+}
+
+# Source the current workspace
+function sourcews(){
+    source ./devel/setup.${ext} && smon
 }
 
 # Source the current workspace
 function sourcethis(){
-	source ./devel/setup.${ext} && smon
+    roshome && source ./devel/setup.${ext} && smon
 }
 
 # Automatic catkin build
 function cb() {
-  catkin build --summarize "$@"
+    pwd_bck=${PWD}
+    catkin build --summarize "$@"
+    sourcethis()
+    cd ${pwd_bck}
 }
 
 # Clean workspace (delete the generated folders, then catkin build)
 function cbclean(){
-	roscd && cd .. && rm -rf build devel install && cb
+    roshome && rm -rf build devel install && cb
 }
 
 function cib(){
diff --git a/dotfiles/terminator/config b/dotfiles/terminator/config
new file mode 100644
index 0000000000000000000000000000000000000000..0b86a0ad3501573f81e31f15f442b4172034dec5
--- /dev/null
+++ b/dotfiles/terminator/config
@@ -0,0 +1,26 @@
+[global_config]
+  window_state = maximise
+  borderless = True
+  tab_position = hidden
+  title_hide_sizetext = True
+  title_use_system_font = False
+  title_font = Hack NF Bold 12
+[keybindings]
+[profiles]
+  [[default]]
+    cursor_shape = ibeam
+    cursor_color = "#aaaaaa"
+    font = Hack Nerd Font Mono 12
+    show_titlebar = False
+    scrollback_infinite = True
+    use_system_font = False
+    copy_on_selection = True
+[layouts]
+  [[default]]
+    [[[window0]]]
+      type = Window
+      parent = ""
+    [[[child1]]]
+      type = Terminal
+      parent = window0
+[plugins]