Consolidated all tools into canvas-sketchpad