Defined more theme variations and styleboxes for those variations to work around an issue where external editor themes would apply incorrect margins to certain buttons. This should eliminate clipping/alignment issues while a custom theme is in use.
Also simplified the step where margins are copied over thanks to @Rindbee 's suggestion