EviType refactoring + theme entity

#62, #103