After base_rules refactoring. Still a few issues (Dark...)