Large update dark schema

The new ACL and some minor things still needs to be done.