Themes

Some fixes and solved theme change without restart.