Comparing the proposed solution with definition of Shabbat in your initial post:

it looks to me that the proposal is more accurate and can be interpreted by those not familiar with the Jewish religion.

I suggest we conclude the discussion.