Version 1 pre editing
Merge branch 'master' of https://github.com/Camsbury/ERC-Theme