Reintroducing styles lost in the move

Fixing conflicts and missing style rules.