Another misc update to fix/streamline the color theme