Themes Injector and minor bugs