theme: Updates

- still sinfully ugly but behaviour is starting to come together