Trump wants the things I listed -- he has expressed them time and again for anyone remotely willing to listen.
If one is trying to negotiate while maintaining a theocracy, then Trump won't listen, but ending the theocracy is one of the listed points, so it's logically consistent.