160 Commits (refactor/neon/dialogs)