made theme names in variables consistent (without "theme-")
fix CI tests