More stylesheet streamlining and reorganization.