Made it work again, mostly
Revive some screenshot stuff