local changes
merged files
Add conditional to check system-name and set font size