2 state - check
went back to 1967 lines - check (with land swaps for the settlements that had been established which amounted to 3.6% of the west bank land)
self rule - check
capital in East Jerusalem - check (even though: "This new trend is most vividly expressed on the bellwether question of citizenship options. Today, half (48%) of the city’s Palestinian residents say that, if they had to make a choice, they would prefer to become citizens of Israel, rather than of a Palestinian state. From 2017 to early 2020, that figure hovered around just 20%. Today, only a minority (43%) of East Jerusalemites say they would pick Palestine; while the remainder (9%) would opt for Jordanian citizenship. Among West Bankers, the comparable figures are Israel, 25%; Palestine, 65%; Jordan, 10%.")
https://www.washingtoninstitute.org/policy-analysis/new-poll-reveals-moderate-trend-among-east-jerusalem-palestinians