Massive refactor for Title plugin... again