Began splitting decors into two groups - see #16