Added some more string replacement options
Merge remote-tracking branch 'origin/master'
Added some more string replacement options.
Updated CSS