add defuns and theme