Move all constants into App resources
Fix conflict