General improvements on theme...

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