Review: updated some references
Cleaned up some style configs