Gui change plus some reverts

Lop.
Merge branch 'master' of https://github.com/Tsukinara/KeyboardPunch