Kamarada theme should be based on an already debranded theme; other fixes
Merge branch '13.1' of https://github.com/kamarada/branding-kamarada into 13.1

Conflicts:
	branding-kamarada.spec