Revert "Decoupled Style objects"

This reverts commit 8cb6f6a04a1cfa3d878610dab75a4818c32bbbf4.