Merge pull request #1 from johanjusits/branch-1

added rules activity, changed some colors