Updated for new site
Add some custom abbreviations
Fixed various conflicts
Fixed merge conflicts
Format change