Fix local.xml
Merge fixes.
Merge branch 'anton/theme' of https://github.com/conceptbulavin/Nextone into anton/theme