Merge pull request #456 from jonezy/development

small fixes,getting ready for F56 config
added reverse conflict/required to colours/stripes/packages
small patch
Merge pull request #457 from shutter111/development

added reverse conflict/required to colours/stripes/packages