fuck theme families, fixing theme state machine