Revert "Revert "notebook + desktop""

This reverts commit 99ef3887f2a5d46dfb21ffca5b6515fd3c645202.
Revert "Revert "Revert "notebook + desktop"""

This reverts commit dd05c4dd58aff5d0840f7cb575084e7261094c7a.