fix theme + fix naming convention