code: cleanup
fixed: SelectTheme dialog