Revert b834b8f..ae74c3b

This rolls back to commit b834b8fd6a6154276c4bf5fcd637eece6cb324f2.
shaking and fade in setup done