Switch to non recursive mappings
Add some css config