Add back default theme and add modern theme