General theme fixes

fixes #1748
Signed-off-by: Antes <antes@simplemachines.org>