Tweaks and updated color scheme