Marks moved to array

Moved the trademark arrays from constants to arrays.
Merge branch 'development'