Revert "Merge branch 'Agge-Branch' of https://github.com/mockiis/Mikonipi into Agge-Branch"

This reverts commit c31d4fd7c68608be4789723e817ffda197d955e1.