Changed layout of types, added first implementation of forcetheorem-type for MAE (test still missing)