Theming system improvements

Implemented save/restore so that setting theme to "nil" after setting
theme to "x" will make sure to reset control state to what it was prior
to applying "x". Allows for the use of "appearance" and
"apperanceWhenContainedIn" together.