Removed lock
Fixed hinter and removed some crap
Fixed hinting rules
Merge branch 'master' into 29/multi-themes