on/off fixes ...
Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #1995 from Antes/theme_fix

on/off fixes ...
Merge remote-tracking branch 'upstream/release-2.1' into code_cleanup