Activation redesign, not working yet --
Merge branch 'master' of https://github.com/borzos6/neves