Theme fix

This PR party fixing the #2453 
Since two smiley related issue not a problem any longer I can say
fixes #2445 and fixes #2128 

meh shitty merge commits also got into this (empty & pointless :P). For details read commit messages please.