The oldlayout
New layout
Two types of border
Merge branch 'master' of https://github.com/JimTouz/CitCatXot