Edit layout-properties
Edit typographical-properties
Add z-index variables
Merge branch 'variables'