Build watches
Updated packages
Style tweaks