Revert "Some Quality of Life Changes"

- This reverts commit 4ac673941714032ada6d26fb60936ec510bbe496.
- The commit breaks some legacy code. It'll be pushed again once some
  things are fixed.

Signed-off-by: Haru <haru@dotalux.com>