issue #427 - proper handling of theme reverting