Lets fix the themechooser!!!!

Thanks @merkrehan