adopted changes from fnogatz/SWT-structure-files@62e200c6d1abd1c874649513febdd2ccdc52e630