Themes update

Changed behavior so that the theme select box is set to the current
theme instead of "No Theme" if one has been chosen already.