[UPDATE] Fixing theme