Added terminal colors and mapping tweaks