Generic theme fix

Read commit note(s) for more info
fixes #2523

Signed-off-by: Antes <antes@simplemachines.org>