Fix soem minor theming issues and bump to 2.0.2