Numerous updates to finalize theme