Updates from Lukas Blakk

Also some small colouring/categorising improvements