Applied theme.  Separated some block logic.