Hero kitty saves the day :P
fixes #2304
fixes #2317
fixes #2319

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

Signed-off-by: Antes <antes@simplemachines.org>
Merge pull request #2348 from Antes/theme_stuff

Hero kitty saves the day :P