Rewrite Using Theos/Logos, Intense Logic Checking, Condensed Workspace, Minor Aesthetic Changes

See comments for more information (maybe more than you needed to know, but hey, that's life).