--- a/styles/mswindows10.style	Wed Dec 18 22:27:50 2019 +0100
+++ b/styles/mswindows10.style	Thu Dec 19 12:04:51 2019 +0100
@@ -1,27 +1,60 @@
-; View defaultStyle:#mswindows8
+; View defaultStyle:#mswindows10
 ;
 ; $Header$
 
+ToolbarIconLibrary                  ?(Smalltalk at:#Windows10ToolbarIconLibrary) ? (Smalltalk at:#Windows8ToolbarIconLibrary) ? (Smalltalk at:#XPToolbarIconLibrary) ? GenericToolbarIconLibrary
+
 #include 'mswindows8.style'
 
-name                    #win10
-comment                 'Windows10 lookalike (unfinished)'
-previewFileName         'viewStyleSample_win10.png'
+name                                #win10
+comment                             'Windows10 lookalike (unfinished)'
+previewFileName                     'viewStyleSample_win10.png'
 
 #if (Language == #german) or:[Language == #de]
-comment  'an Windows10 angelehnter Stil (unvollständig)'
+comment                             'an Windows10 angelehnter Stil (unvollständig)'
 #endif
 
 #if (Language == #french) or:[Language == #fr]
-comment  'Un style qui résemble Windows10 (incomplet)'
+comment                             'Un style qui résemble Windows10 (incomplet)'
 #endif
 
 ;
 ; unfinished
 ;
 
-menu.enteredLevel               0
+menu.enteredLevel                   0
 scrollableView.level                0
 scrolledView.level                  0
 ; currently has trouble on win machines
 ; scrollBar.hideIfPointerOutside      true
+
+
+arrowButton.upForm                  (ToolbarIconLibrary scrollUpOffIcon)
+arrowButton.enteredUpForm           (ToolbarIconLibrary scrollUpOffEnteredIcon)
+arrowButton.activeUpForm            (ToolbarIconLibrary scrollUpActiveIcon)
+arrowButton.disabledUpForm          (ToolbarIconLibrary scrollUpDisabledIcon)
+
+arrowButton.downForm                (ToolbarIconLibrary scrollDownOffIcon)
+arrowButton.enteredDownForm         (ToolbarIconLibrary scrollDownOffEnteredIcon)
+arrowButton.activeDownForm          (ToolbarIconLibrary scrollDownActiveIcon)
+arrowButton.disabledDownForm        (ToolbarIconLibrary scrollDownDisabledIcon)
+
+arrowButton.leftForm                (ToolbarIconLibrary scrollLeftOffIcon)
+arrowButton.enteredLeftForm         (ToolbarIconLibrary scrollLeftOffEnteredIcon)
+arrowButton.activeLeftForm          (ToolbarIconLibrary scrollLeftActiveIcon)
+arrowButton.disabledLeftForm        (ToolbarIconLibrary scrollLeftDisabledIcon)
+
+arrowButton.rightForm               (ToolbarIconLibrary scrollRightOffIcon)
+arrowButton.enteredRightForm        (ToolbarIconLibrary scrollRightOffEnteredIcon)
+arrowButton.activeRightForm         (ToolbarIconLibrary scrollRightActiveIcon)
+arrowButton.disabledRightForm       (ToolbarIconLibrary scrollRightDisabledIcon)
+
+arrowButton.leftFormFile            nil
+arrowButton.enteredLeftFormFile     nil
+arrowButton.activeLeftFormFile      nil
+arrowButton.disabledLeftFormFile    nil
+
+arrowButton.rightFormFile           nil
+arrowButton.enteredRightFormFile    nil
+arrowButton.activeRightFormFile     nil
+arrowButton.disabledRightFormFile   nil

--- a/styles/mswindows8.style	Wed Dec 18 22:27:50 2019 +0100
+++ b/styles/mswindows8.style	Thu Dec 19 12:04:51 2019 +0100
@@ -2,16 +2,16 @@
 ;
 ; $Header$
 
-name                    #win8
-comment                 'Windows8 lookalike (unfinished)'
-previewFileName         'viewStyleSample_win8.png'
+name                            #win8
+comment                         'Windows8 lookalike (unfinished)'
+previewFileName                 'viewStyleSample_win8.png'
 
 #if (Language == #german) or:[Language == #de]
-comment  'an Windows8 angelehnter Stil (unvollständig)'
+comment                         'an Windows8 angelehnter Stil (unvollständig)'
 #endif
 
 #if (Language == #french) or:[Language == #fr]
-comment  'Un style qui résemble Windows8 (incomplet)'
+comment                         'Un style qui résemble Windows8 (incomplet)'
 #endif
 
 
@@ -76,12 +76,12 @@
 menu.enteredForegroundColor                 =menu.hilightForegroundColor
 menu.iconIndicationOn.bitmapFile            'CheckOn_xp.xpm'
 menu.iconIndicationOff.bitmapFile           'CheckOff_xp.xpm'
-menu.iconRadioOn.bitmap                     (Windows8ToolbarIconLibrary radioOn12x12Icon)
-menu.iconRadioOff.bitmap                    (Windows8ToolbarIconLibrary radioOff12x12Icon)
+menu.iconRadioOn.bitmap                     (ToolbarIconLibrary radioOn12x12Icon)
+menu.iconRadioOff.bitmap                    (ToolbarIconLibrary radioOff12x12Icon)
 menu.iconDisabledIndicationOn.bitmapFile    'CheckOn_disabled_xp.xpm'
 menu.iconDisabledIndicationOff.bitmapFile   'CheckOff_disabled_xp.xpm'
-menu.iconDisabledRadioOn.bitmap             (Windows8ToolbarIconLibrary radioOnDisabled12x12Icon)
-menu.iconDisabledRadioOff.bitmap            (Windows8ToolbarIconLibrary radioOffDisabled12x12Icon)
+menu.iconDisabledRadioOn.bitmap             (ToolbarIconLibrary radioOnDisabled12x12Icon)
+menu.iconDisabledRadioOff.bitmap            (ToolbarIconLibrary radioOffDisabled12x12Icon)
 
 button.edgeStyle                       nil
 button.borderWidth                     1
@@ -100,10 +100,10 @@
 radioButton.borderWidth                 0
 comboView.button.borderWidth            0
 
-comboView.downForm                      (Windows8ToolbarIconLibrary scrollDownOffIcon)
-comboView.disabledDownForm              (Windows8ToolbarIconLibrary scrollDownOffIcon)
-comboView.enteredDownForm               (Windows8ToolbarIconLibrary scrollDownOffEntered2Icon)
-comboView.activeDownForm                (Windows8ToolbarIconLibrary scrollDownActiveIcon)
+comboView.downForm                      (ToolbarIconLibrary scrollDownOffIcon)
+comboView.disabledDownForm              (ToolbarIconLibrary scrollDownOffIcon)
+comboView.enteredDownForm               (ToolbarIconLibrary scrollDownOffEntered2Icon)
+comboView.activeDownForm                (ToolbarIconLibrary scrollDownActiveIcon)
 ; comboView.downFormFile                  'ComboDn_xp.xpm'.
 ; comboView.disabledDownFormFile          'ComboDn_disabled_xp.xpm'.
 ; comboView.activeDownFormFile            'ComboDn_active_xp.xpm'.
@@ -139,25 +139,25 @@
 miniScroller.size               3     "/ in millimeters
 
 
-arrowButton.upForm                  (Windows8ToolbarIconLibrary scrollUpOffIcon)
-arrowButton.enteredUpForm           (Windows8ToolbarIconLibrary scrollUpOffEntered2Icon)
-arrowButton.activeUpForm            (Windows8ToolbarIconLibrary scrollUpActiveIcon)
-arrowButton.disabledUpForm          (Windows8ToolbarIconLibrary scrollUpOffIcon)
+arrowButton.upForm                  (ToolbarIconLibrary scrollUpOffIcon)
+arrowButton.enteredUpForm           (ToolbarIconLibrary scrollUpOffEntered2Icon)
+arrowButton.activeUpForm            (ToolbarIconLibrary scrollUpActiveIcon)
+arrowButton.disabledUpForm          (ToolbarIconLibrary scrollUpOffIcon)
 
-arrowButton.downForm                (Windows8ToolbarIconLibrary scrollDownOffIcon)
-arrowButton.enteredDownForm         (Windows8ToolbarIconLibrary scrollDownOffEntered2Icon)
-arrowButton.activeDownForm          (Windows8ToolbarIconLibrary scrollDownActiveIcon)
-arrowButton.disabledDownForm        (Windows8ToolbarIconLibrary scrollDownOffIcon)
+arrowButton.downForm                (ToolbarIconLibrary scrollDownOffIcon)
+arrowButton.enteredDownForm         (ToolbarIconLibrary scrollDownOffEntered2Icon)
+arrowButton.activeDownForm          (ToolbarIconLibrary scrollDownActiveIcon)
+arrowButton.disabledDownForm        (ToolbarIconLibrary scrollDownOffIcon)
 
-arrowButton.leftForm                (Windows8ToolbarIconLibrary scrollLeftOffIcon)
-arrowButton.enteredLeftForm         (Windows8ToolbarIconLibrary scrollLeftOffEntered2Icon)
-arrowButton.activeLeftForm          (Windows8ToolbarIconLibrary scrollLeftActiveIcon)
-arrowButton.disabledLeftForm        (Windows8ToolbarIconLibrary scrollLeftOffIcon)
+arrowButton.leftForm                (ToolbarIconLibrary scrollLeftOffIcon)
+arrowButton.enteredLeftForm         (ToolbarIconLibrary scrollLeftOffEntered2Icon)
+arrowButton.activeLeftForm          (ToolbarIconLibrary scrollLeftActiveIcon)
+arrowButton.disabledLeftForm        (ToolbarIconLibrary scrollLeftOffIcon)
 
-arrowButton.rightForm               (Windows8ToolbarIconLibrary scrollRightOffIcon)
-arrowButton.enteredRightForm        (Windows8ToolbarIconLibrary scrollRightOffEntered2Icon)
-arrowButton.activeRightForm         (Windows8ToolbarIconLibrary scrollRightActiveIcon)
-arrowButton.disabledRightForm       (Windows8ToolbarIconLibrary scrollRightOffIcon)
+arrowButton.rightForm               (ToolbarIconLibrary scrollRightOffIcon)
+arrowButton.enteredRightForm        (ToolbarIconLibrary scrollRightOffEntered2Icon)
+arrowButton.activeRightForm         (ToolbarIconLibrary scrollRightActiveIcon)
+arrowButton.disabledRightForm       (ToolbarIconLibrary scrollRightOffIcon)
 
 
 arrowButton.leftFormFile          'ScrollLt.xp.xpm'
@@ -183,28 +183,28 @@
 noteBook.passiveBackgroundColor   =lightenedViewGrey
 
 checkToggle.bitmapFile            'CheckOn10_xp.xpm'
-radioButton.passiveImage          (Windows8ToolbarIconLibrary radioOff12x12Icon)
-radioButton.activeImage           (Windows8ToolbarIconLibrary radioOn12x12Icon)
-radioButton.enteredPassiveImage   (Windows8ToolbarIconLibrary radioOffEntered12x12Icon)
-radioButton.enteredActiveImage    (Windows8ToolbarIconLibrary radioOnEntered12x12Icon)
-radioButton.disabledPassiveImage  (Windows8ToolbarIconLibrary radioOffDisabled12x12Icon)
-radioButton.disabledActiveImage   (Windows8ToolbarIconLibrary radioOnDisabled12x12Icon)
-checkToggle.disabledActiveImage   (Windows8ToolbarIconLibrary checkToggleOnDisabledIcon)
-checkToggle.disabledPassiveImage  (Windows8ToolbarIconLibrary checkToggleOffDisabledIcon)
-checkToggle.activeImage           (Windows8ToolbarIconLibrary checkToggleOnIcon)
-checkToggle.passiveImage          (Windows8ToolbarIconLibrary checkToggleOffIcon)
-checkToggle.enteredPassiveImage   (Windows8ToolbarIconLibrary checkToggleOffEnteredIcon)
-checkToggle.enteredActiveImage    (Windows8ToolbarIconLibrary checkToggleOnEnteredIcon)
+radioButton.passiveImage          (ToolbarIconLibrary radioOff12x12Icon)
+radioButton.activeImage           (ToolbarIconLibrary radioOn12x12Icon)
+radioButton.enteredPassiveImage   (ToolbarIconLibrary radioOffEntered12x12Icon)
+radioButton.enteredActiveImage    (ToolbarIconLibrary radioOnEntered12x12Icon)
+radioButton.disabledPassiveImage  (ToolbarIconLibrary radioOffDisabled12x12Icon)
+radioButton.disabledActiveImage   (ToolbarIconLibrary radioOnDisabled12x12Icon)
+checkToggle.disabledActiveImage   (ToolbarIconLibrary checkToggleOnDisabledIcon)
+checkToggle.disabledPassiveImage  (ToolbarIconLibrary checkToggleOffDisabledIcon)
+checkToggle.activeImage           (ToolbarIconLibrary checkToggleOnIcon)
+checkToggle.passiveImage          (ToolbarIconLibrary checkToggleOffIcon)
+checkToggle.enteredPassiveImage   (ToolbarIconLibrary checkToggleOffEnteredIcon)
+checkToggle.enteredActiveImage    (ToolbarIconLibrary checkToggleOnEnteredIcon)
 checkToggle.activeLevel           0
 checkToggle.passiveLevel          0
 checkToggle.disabledBackgroundColor     =viewGrey
 checkToggle.backgroundColor             =viewGrey
 checkToggle.activeBackgroundColor       =viewGrey
 
-menu.iconIndicationOn             (Windows8ToolbarIconLibrary checkToggleOnIcon)
-menu.iconIndicationOff            (Windows8ToolbarIconLibrary checkToggleOffIcon)
-menu.iconDisabledIndicationOn     (Windows8ToolbarIconLibrary checkToggleOffDisabledIcon)
-menu.iconDisabledIndicationOff    (Windows8ToolbarIconLibrary checkToggleOffIcon)
+menu.iconIndicationOn             (ToolbarIconLibrary checkToggleOnIcon)
+menu.iconIndicationOff            (ToolbarIconLibrary checkToggleOffIcon)
+menu.iconDisabledIndicationOn     (ToolbarIconLibrary checkToggleOffDisabledIcon)
+menu.iconDisabledIndicationOff    (ToolbarIconLibrary checkToggleOffIcon)
 
 noteBook.activeTabMarkerColor       (Color red:100 green:78 blue:23)