(wip), updates
Merge branch 'master' of github.com:tunnckoCore/docks
(wip), updates, refactoring