Adjust colors and groups to better resemble original theme