EviType refactoring + theme entity

Solves #62, #103, #104