public static preferences + clickable Shapes
Revert "public static preferences + clickable Shapes"

This reverts commit 26bdc2fa93b1bd04586030130bdbd3697dddd683.