Disabled reselecting the current theme.
Made style more consistent.