Unify apps
Merge pull request #3 from drkitty/unify-apps

Unify apps