Move Themes header to Personal Category and cleanup