Non-WIMP vs ubiquitous computing

So, what would you call as a main difference between non-WIMP and ubiquitous computing? I know that non-WIMP is seen as interface seen after WIMP, kinda as a revolution of user interface, and that main idea of ubiquitous computing is to get to something Mark Weiser called "calm technology". Can we say that non-WIMP end goal is to get to be called ubiquitous?