syncing with erik
eriksfirstcommit
Merge remote-tracking branch 'origin/erik'
added navbar themed