Fixing themes and navigation

I do still have a problem with collapsable nav, that is a todo for later