Fixed bugs and now theme menu remembers (and selects) what the current theme is.