Add rules, add themes, minor improvements