Updated rules to fit reorganized styling