Fix trash
Use custom sorting instead of trash
Magic constants
Colored marks
Merge branch 'master' of github.com:lesh-dev/core