Themes should be handled from system menu as well as refresh
Themes should be handled from system menu as well as refresh