Unified VK. Sym/Dvorak. HIG update.

* Symbol mods improving apostrophe and hyphen
* Dvorak layouts with ergo variants
* Help Image Generator updated for Inkscape v1.0
* BaseLayout unified for ANS/ISO w/ KLM-QW codes
* Some mapping tweaks. Disable mappings/keys w/ --.

.gitignore

@@ -11,4 +11,4 @@
 Layouts/*/*ImgGen_*
 Layouts/*/*/*ImgGen_*
 *PKL.exe
-EPKL_*able.zip
+EPKL_*able*.zip

Data/pkl.pafdata

@@ -1,3 +1,3 @@
 [PAFDATA]
 Category=Accessibility
-label=Portable Keyboard &Layout
+label=EPiKaL Portable &Keyboard Layout

EPKL_Layouts_Override.ini

@@ -19,14 +19,14 @@ LocalID = -- 		; @L: --, Locale code. Check in the layout folders which combos e
 KbdType = ISO 		; @K:     ANS (US/ANSI 101/104 key), ISO (Euro/World 102/105 key)
 CurlMod = Curl 		; @C: --, Curl, CurlM (DH mod; usually with an A/Angle ergo mod. CurlM/DHm isn't premade.)
 ErgoMod = Awide 	; @E: --, Angle, AWide, AWing
-OthrMod = Sym 		; @O: --, Any other mods defined as a suffix, such as DreymaR's Sym
+;OthrMod = Sym 		; @O: --, Any other mods defined as a suffix, such as DreymaR's Sym
 
 ;;  Tarmak learning steps: Gradually switch from VirtualKey QWERTY to Colemak. See the Layouts_Default file.
 ;layout = Tarmak\Tm1-VK@V:Tarmak1@C,Tarmak\Tm2-VK@V:Tarmak2@C,Tarmak\Tm3-VK@V:Tarmak3@C,Tarmak\Tm4-VK@V:Tarmak4@C,Tarmak\Tm5-VK@V:Colemak(VK)@C
 ;layout = Tarmak\Tm1-VK@V:Tarmak1@C,Tarmak\Tm0-VK@K@E:QWERTY(VK)@E
 
 ;;  Colemak[edition DreymaR] or VirtualKey; switch to QWERTY with the same ergo mods except Curl/Other. Dvorak similarly below.
-;layout = Colemak-@T\Cmk-@T@L@K@C@E@O:Colemak(@T)@L@C@E-@O,QWERTY\QWE-@T@K@E:QWERTY(@T)@E
+layout = Colemak-@T\Cmk-@T@L@K@C@E@O:Colemak(@T)@L@C@E-@O,QWERTY\QWE-@T@K@E:QWERTY(@T)@E
 ;layout = Dvorak\Dvk-@T@L@K@C@E@O:Dvorak(@T)@L@C@E-@O,QWERTY\QWE-@T@K@E:QWERTY(@T)@E
 
 ;;  Start with plain Virtualkey QWERTY; switch to non-locale Colemak with ergo mods
@@ -38,7 +38,7 @@ OthrMod = Sym 		; @O: --, Any other mods defined as a suffix, such as DreymaR's
 ;;  TODO: Test an imported layout (switch to Colemak)
 ;layout = _Import\CmkCAWeD_WIP,Colemak-@T\Cmk-@T@L@V:Colemak(@T)@L@C@E
 ;;  WIP: Test out a layout on switch
-layout = Colemak-@T\Cmk-@T@L@V:Colemak(@T)@L@C@E,_WIP\Cmk-eD-ItAl_ISO_CurlAngle:Test Cmk-eD-ItAl_ISO_CA,_WIP\Cmk-eD-ItAl_ANS_CurlAngle:Test Cmk-eD-ItAl_ANS_CA 	;,QWERTY\QWE-VK_ISO:QWERTY(VK)-test
+layout = Colemak-@T\Cmk-@T@L@V:Colemak(@T)@L@C@E,_WIP\Cmk-eD-ItAl_ISO_CurlAngle:Test Cmk-eD-ItAl_ISO_CA 	;,QWERTY\QWE-VK_ISO:QWERTY(VK)-test
 
 
 [layout]

Files/README.md

@@ -156,16 +156,22 @@ DONE:
 	- Fixed: The janitor timer kept resending mod up strokes every # s. Now it's once only after recent keyboard activity.
 	- Minor: Made a bool() fn to use bool(pklIniRead()) instead of a dedicated pklIniBool().
 	- Tested: The LAlt key (SC038) can work as Extend Modifier, just like any other key can. (Remapping another key to LAlt can still be tricky.)
-* EPKL v1.1.4α: Remap/mapping/setting tweaks. Dvorak and Sym mod layouts.
-	- Remap cycles can consist of minicycles separated by slashes, like this: | a | b / c | d | e | to remap a-b and c-d-e separately.
-	- Instead of special '_ExtDV' remaps for Extend Ctrl+V to follow V under CurlDH, now prepend the mapSC_extend remap with 'V-B,'.
+* EPKL v1.1.4: Sym mod and Dvorak layouts. HIG updated for new Inkscape. Unified VK codes for layouts. Mapping/setting tweaks.
+	- Three Sym(bol) mod variants: Improving quote/apostrophe (Qu), Minus/hyphen (Mn) or both (QuMn). ANSI uses both. Choose between them in the Remap file.
+		- Premade Sym(QuMn) variants for VK/eD Colemak vanilla and CAW.
+	- Dvorak layouts, with suitable Curl/Angle/Wide ergo mods. These are my suggestions and not "official" variants for now.
+	- The HIG (Help Image Generator) has been updated for Inkscape v1.0 that's finally out! All images are now created in one call, a lot faster.
+		- Also tweaked the HIG for Co_## KLM key codes since the image template doesn't have the underscore for these codes.
+	- My KLM QW_## codes found in the Remap file may replace VK codes in layouts.
+		- All BaseLayout files are now unified for KbdType by replacing ANS/ISO specific OEM_# VK codes with KLM ones.
+		- Added a KbdType setting in the layout files, overriding the one used in layout selection.
+		- KbdType @K codes for ANS/ISO in LayStack files, further simplifying ISO/ANSI conversion. (For baseLayout, mapSC_, img_Extend#/DKeyDir/bgImage.)
 	- Keys can now be disabled by '--' or VK mapped to themselves by VK(ey) as their first layout entry.
 	- Key state and dead key mappings can be disabled using '--' or '-1' entries. Thus an entry can be removed in the LayStack.
-	- Added Dvorak layouts, with suitable Curl/Angle/Wide ergo mods. These are my suggestions and not "official" variants for now.
-	- Three Sym(bol) mod variants: Improving quote/apostrophe (Qu), Minus/hyphen (Mn) or both (QuMn). Choose between them in the Remap file.
-	- Added a KbdType setting in layout.ini files. It overrides the one used in the layout selection.
-	- Added @K codes for ANS/ISO in LayStack files, to simplify ISO/ANSI conversion. (For baseLayout, mapSC_, img_Extend#/DKeyDir/bgImage.)
+	- Remap cycles can consist of minicycles separated by slashes, like this: | a | b / c | d | e | to remap a-b and c-d-e separately.
+	- Instead of special '_ExtDV' remaps for Extend Ctrl+V to follow V under CurlDH, now prepend the mapSC_extend remap with 'V-B,'.
 	- All mapVK_mecSym (ANS2ISO/ISO2ANS) mappings removed from layout.ini files. Still left in BaseLayout files as an example.
+	- Set the help image refresh timer a bit faster. Seems to help for Extend2, but not for Tap-Ext Kaomoji DK nor the initial help image?
 
 
 TODO:

Layouts/Colemak-eD/Cmk-eD-BaHrRsSi_ISO_CurlAWide/layout.ini

@@ -59,14 +59,14 @@ img_DKeyDir     = ..\Cmk-eD_@K_CurlAWide\DeadkeyImg
 shiftStates    =			0	:	1	:	2	:	6	:	7		;	8	:	9
 ;; SC = VKEY    	CStat	Base	Shift	Ctrl	AltGr	AGrSh	;	SGCap	SGCSh
 ;; This variant is probably best if using a Wide ergo mod so caron is closer to the right index finger
-SC01a = OEM_6   	1   	đ   	Đ   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BaHrRsSi
-SC01b = OEM_1   	1   	@2c7	@2c7	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BaHrRsSi
-SC056 = OEM_102 	5   	ć   	Ć   	--  	ø   	Ø   	; QWERTY OEM_102 ; Cmk-eD-BaHrRsSi
+SC01a = QW_LB   	1   	đ   	Đ   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BaHrRsSi
+SC01b = QW_RB   	1   	@2c7	@2c7	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BaHrRsSi
+SC056 = QW_LG   	5   	ć   	Ć   	--  	ø   	Ø   	; QWERTY <> ; Cmk-eD-BaHrRsSi
 
 ;; This variant may be best if not using a Wide ergo mod so caron is closer to the pinky?
-;SC01a = OEM_6   	1   	@2c7	@2c7	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BaHrRsSi
-;SC01b = OEM_1   	1   	đ   	Đ   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BaHrRsSi
-;SC056 = OEM_102 	5   	ć   	Ć   	--  	ø   	Ø   	; QWERTY OEM_102 ; Cmk-eD-BaHrRsSi
+;SC01a = QW_LB   	1   	@2c7	@2c7	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BaHrRsSi
+;SC01b = QW_RB   	1   	đ   	Đ   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BaHrRsSi
+;SC056 = QW_LG   	5   	ć   	Ć   	--  	ø   	Ø   	; QWERTY <> ; Cmk-eD-BaHrRsSi
 
 [deadKeyNames]
 ;;  Names listed in this section will override those in the deadkey tables file.

Layouts/Colemak-eD/Cmk-eD-BeCaFr_ISO_AWide/layout.ini

@@ -75,23 +75,23 @@ img_DKeyDir     = ..\Cmk-eD_@K_AWide\DeadkeyImg
 shiftStates    =			0	:	1	:	2	:	6	:	7		;	8	:	9
 ;; SC = VKEY    	CStat	Base	Shift	Ctrl	AltGr	AGrSh	;	SGCap	SGCSh
 
-;SC01a = OEM_6   	4   	[   	{   	&Esc	å   	Å   	; QWERTY [{ ; Cmk-eD ISO
-SC01a = OEM_6   	4   	@05e	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BeCaFr
-;SC01a = OEM_6   	4   	@0b4	@060	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BrPt
-;SC01a = OEM_6   	4   	@0b4	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-EsLat
-;SC01a = OEM_6   	4   	è   	é   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-It
+;SC01a = QW_LB   	4   	[   	{   	&Esc	å   	Å   	; QWERTY [{ ; Cmk-eD ISO
+SC01a = QW_LB   	4   	@05e	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BeCaFr
+;SC01a = QW_LB   	4   	@0b4	@060	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BrPt
+;SC01a = QW_LB   	4   	@0b4	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-EsLat
+;SC01a = QW_LB   	4   	è   	é   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-It
 
-;SC01b = OEM_1   	0   	]   	}   	--  	æ   	Æ   	; QWERTY ]} ; Cmk-eD ISO
-SC01b = OEM_1   	0   	@060	№   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BeCaFr
-;SC01b = OEM_1   	0   	@07e	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BrPt
-;SC01b = OEM_1   	0   	@060	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-EsLat
-;SC01b = OEM_1   	0   	à   	ò   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-It
+;SC01b = QW_RB   	0   	]   	}   	--  	æ   	Æ   	; QWERTY ]} ; Cmk-eD ISO
+SC01b = QW_RB   	0   	@060	№   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BeCaFr
+;SC01b = QW_RB   	0   	@07e	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BrPt
+;SC01b = QW_RB   	0   	@060	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-EsLat
+;SC01b = QW_RB   	0   	à   	ò   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-It
 
-;SC056 = OEM_102 	5   	œ   	Œ   	--  	ø   	Ø   	; QWERTY OEM_102 ; Cmk-eD ISO
-SC056 = OEM_102 	5   	é   	É   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-BeCaFr
-;SC056 = OEM_102 	5   	ç   	Ç   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-BrPt
-;SC056 = OEM_102 	5   	ñ   	Ñ   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-EsLat
-;SC056 = OEM_102 	5   	ù   	ì   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-It
+;SC056 = QW_LG   	5   	œ   	Œ   	--  	ø   	Ø   	; QWERTY <> ; Cmk-eD ISO
+SC056 = QW_LG   	5   	é   	É   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-BeCaFr
+;SC056 = QW_LG   	5   	ç   	Ç   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-BrPt
+;SC056 = QW_LG   	5   	ñ   	Ñ   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-EsLat
+;SC056 = QW_LG   	5   	ù   	ì   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-It
 
 [deadKeyNames]
 ;;  Names listed in this section will override those in the deadkey tables file.

Layouts/Colemak-eD/Cmk-eD-BeCaFr_ISO_CurlAWide/layout.ini

@@ -75,23 +75,23 @@ img_DKeyDir     = ..\Cmk-eD_@K_CurlAWide\DeadkeyImg
 shiftStates    =			0	:	1	:	2	:	6	:	7		;	8	:	9
 ;; SC = VKEY    	CStat	Base	Shift	Ctrl	AltGr	AGrSh	;	SGCap	SGCSh
 
-;SC01a = OEM_6   	4   	[   	{   	&Esc	å   	Å   	; QWERTY [{ ; Cmk-eD ISO
-SC01a = OEM_6   	4   	@05e	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BeCaFr
-;SC01a = OEM_6   	4   	@0b4	@060	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BrPt
-;SC01a = OEM_6   	4   	@0b4	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-EsLat
-;SC01a = OEM_6   	4   	è   	é   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-It
+;SC01a = QW_LB   	4   	[   	{   	&Esc	å   	Å   	; QWERTY [{ ; Cmk-eD ISO
+SC01a = QW_LB   	4   	@05e	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BeCaFr
+;SC01a = QW_LB   	4   	@0b4	@060	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-BrPt
+;SC01a = QW_LB   	4   	@0b4	@0a8	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-EsLat
+;SC01a = QW_LB   	4   	è   	é   	&Esc	[   	{   	; QWERTY [{ ; Cmk-eD-It
 
-;SC01b = OEM_1   	0   	]   	}   	--  	æ   	Æ   	; QWERTY ]} ; Cmk-eD ISO
-SC01b = OEM_1   	0   	@060	№   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BeCaFr
-;SC01b = OEM_1   	0   	@07e	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BrPt
-;SC01b = OEM_1   	0   	@060	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-EsLat
-;SC01b = OEM_1   	0   	à   	ò   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-It
+;SC01b = QW_RB   	0   	]   	}   	--  	æ   	Æ   	; QWERTY ]} ; Cmk-eD ISO
+SC01b = QW_RB   	0   	@060	№   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BeCaFr
+;SC01b = QW_RB   	0   	@07e	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-BrPt
+;SC01b = QW_RB   	0   	@060	@05e	--  	]   	}   	; QWERTY ]} ; Cmk-eD-EsLat
+;SC01b = QW_RB   	0   	à   	ò   	--  	]   	}   	; QWERTY ]} ; Cmk-eD-It
 
-;SC056 = OEM_102 	5   	œ   	Œ   	--  	ø   	Ø   	; QWERTY OEM_102 ; Cmk-eD ISO
-SC056 = OEM_102 	5   	é   	É   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-BeCaFr
-;SC056 = OEM_102 	5   	ç   	Ç   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-BrPt
-;SC056 = OEM_102 	5   	ñ   	Ñ   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-EsLat
-;SC056 = OEM_102 	5   	ù   	ì   	--  	œ   	Œ   	; QWERTY OEM_102 ; Cmk-eD-It
+;SC056 = QW_LG   	5   	œ   	Œ   	--  	ø   	Ø   	; QWERTY <> ; Cmk-eD ISO
+SC056 = QW_LG   	5   	é   	É   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-BeCaFr
+;SC056 = QW_LG   	5   	ç   	Ç   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-BrPt
+;SC056 = QW_LG   	5   	ñ   	Ñ   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-EsLat
+;SC056 = QW_LG   	5   	ù   	ì   	--  	œ   	Œ   	; QWERTY <> ; Cmk-eD-It
 
 [deadKeyNames]
 ;;  Names listed in this section will override those in the deadkey tables file.

Layouts/Colemak-eD/Cmk-eD-Bg_ANS/layout.ini

@@ -58,7 +58,7 @@ img_bgImage     = Files\ImgBackground\Bg_@K_finger-eD-FShui.png
 shiftStates    =			0	:	1	:	2	:	6	:	7		;	8	:	9
 ;; SC = VKEY    	CStat	Base	Shift	Ctrl	AltGr	AGrSh	;	SGCap	SGCSh
 
-SC029 = OEM_3   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
+SC029 = QW_GR   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
 ;SC002 = 1       	0   	1   	!   	--  	́    	--  	; QWERTY 1!
 ;SC003 = 2       	0   	2   	@   	--  	̋   	--  	; QWERTY 2@
 ;SC004 = 3       	0   	3   	№   	--  	#   	--  	; QWERTY 3#
@@ -69,8 +69,8 @@ SC029 = OEM_3   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
 ;SC009 = 8       	0   	8   	*   	--  	₽   	--  	; QWERTY 8*
 ;SC00a = 9       	0   	9   	(   	--  	[   	--  	; QWERTY 9(
 ;SC00b = 0       	0   	0   	)   	--  	]   	--  	; QWERTY 0)
-;SC00c = OEM_MINUS	0   	-   	_   	--  	--    	--  	; QWERTY -_
-;SC00d = OEM_PLUS	1   	ъ   	Ъ   	--  	=   	+   	; QWERTY =+ - Rulemak ъЪ
+;SC00c = QW_MN   	0   	-   	_   	--  	--    	--  	; QWERTY -_
+;SC00d = QW_EQ   	1   	ъ   	Ъ   	--  	=   	+   	; QWERTY =+ - Rulemak ъЪ
 
 SC010 = Q       	5   	я   	Я   	--  	q   	Q   	; QWERTY qQ
 SC011 = W       	5   	ж   	Ж   	--  	w   	W   	; QWERTY wW
@@ -81,9 +81,9 @@ SC015 = J       	5   	й   	Й   	--  	j   	J   	; QWERTY yY
 SC016 = L       	5   	л   	Л   	--  	l   	L   	; QWERTY uU
 SC017 = U       	5   	у   	У   	--  	u   	U   	; QWERTY iI
 SC018 = Y       	5   	ъ   	Ъ   	--  	y   	Y   	; QWERTY oO - Rulemak ыЫ
-SC019 = OEM_1   	1   	;   	:   	--  	ы   	Ы   	; QWERTY pP - Rulemak юЮ
-SC01a = OEM_4   	1   	ш   	Ш   	--  	[   	{   	; QWERTY [{ - Rulemak шШ «{
-SC01b = OEM_6   	1   	щ   	Щ   	--  	]   	}   	; QWERTY ]} - Rulemak щЩ »}
+SC019 = QW_SC   	1   	;   	:   	--  	ы   	Ы   	; QWERTY pP - Rulemak юЮ
+SC01a = QW_LB   	1   	ш   	Ш   	--  	[   	{   	; QWERTY [{ - Rulemak шШ «{
+SC01b = QW_RB   	1   	щ   	Щ   	--  	]   	}   	; QWERTY ]} - Rulemak щЩ »}
 
 SC01e = A       	5   	а   	А   	--  	a   	A   	; QWERTY aA
 SC01f = R       	5   	р   	Р   	--  	r   	R   	; QWERTY sS
@@ -95,20 +95,20 @@ SC024 = N       	5   	н   	Н   	--  	n   	N   	; QWERTY jJ
 SC025 = E       	5   	е   	Е   	--  	e   	E   	; QWERTY kK
 SC026 = I       	5   	и   	И   	--  	i   	I   	; QWERTY lL
 SC027 = O       	5   	о   	О   	--  	o   	O   	; QWERTY ;:
-SC028 = OEM_7   	4   	'   	"   	--  	э   	Э   	; QWERTY '" - Rulemak ьЬ '"
-SC02b = OEM_5   	4   	ю   	Ю   	--  	\   	|   	; QWERTY \| - Rulemak эЭ
+SC028 = QW_QU   	4   	'   	"   	--  	э   	Э   	; QWERTY '" - Rulemak ьЬ '"
+SC02b = QW_BS   	4   	ю   	Ю   	--  	\   	|   	; QWERTY \| - Rulemak эЭ
 
+SC056 = QW_LG    	0   	̀    	@0a8	--  	̀    	—   	; QWERTY QW_102 - Rulemak ́ ̋
 SC02c = Z       	5   	з   	З   	--  	z   	Z   	; QWERTY zZ
 SC02d = X       	5   	ч   	Ч   	--  	x   	X   	; QWERTY xX - Rulemak хХ
 SC02e = C       	5   	ц   	Ц   	--  	c   	C   	; QWERTY cC
 SC02f = V       	5   	в   	В   	--  	v   	V   	; QWERTY vV
 SC030 = B       	5   	б   	Б   	--  	b   	B   	; QWERTY bB
 SC031 = K       	5   	к   	К   	--  	k   	K   	; QWERTY nN
 SC032 = M       	5   	м   	М   	--  	m   	M   	; QWERTY mM
-;SC033 = OEM_COMMA	0   	,   	;   	--  	<   	--  	; QWERTY ,<
-;SC034 = OEM_PERIOD	0   	.   	:   	--  	>   	--  	; QWERTY .>
-;SC035 = OEM_2   	0   	/   	?   	--  	--  	--  	; QWERTY /?
-SC056 = OEM_102 	0   	̀    	@0a8	--  	̀    	—   	; QWERTY OEM_102 - Rulemak ́ ̋
+;SC033 = QW_CM   	0   	,   	;   	--  	<   	--  	; QWERTY ,<
+;SC034 = QW_DT   	0   	.   	:   	--  	>   	--  	; QWERTY .>
+;SC035 = QW_SL   	0   	/   	?   	--  	--  	--  	; QWERTY /?
 
 [deadKeyNames]
 ;;  Names listed in this section will override those in the deadkey tables file.

Layouts/Colemak-eD/Cmk-eD-Bg_ANS_CurlAWide/layout.ini

@@ -59,7 +59,7 @@ img_DKeyDir     = ..\Cmk-eD_@K_CurlAWide\DeadkeyImg
 shiftStates    =			0	:	1	:	2	:	6	:	7		;	8	:	9
 ;; SC = VKEY    	CStat	Base	Shift	Ctrl	AltGr	AGrSh	;	SGCap	SGCSh
 
-SC029 = OEM_3   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
+SC029 = QW_GR   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
 ;SC002 = 1       	0   	1   	!   	--  	́    	--  	; QWERTY 1!
 ;SC003 = 2       	0   	2   	@   	--  	̋   	--  	; QWERTY 2@
 ;SC004 = 3       	0   	3   	№   	--  	#   	--  	; QWERTY 3#
@@ -70,8 +70,8 @@ SC029 = OEM_3   	1   	ь   	Ь   	--  	`   	~   	; QWERTY `~ - Rulemak ёЁ
 ;SC009 = 8       	0   	8   	*   	--  	₽   	--  	; QWERTY 8*
 ;SC00a = 9       	0   	9   	(   	--  	[   	--  	; QWERTY 9(
 ;SC00b = 0       	0   	0   	)   	--  	]   	--  	; QWERTY 0)
-;SC00c = OEM_MINUS	0   	-   	_   	--  	--    	--  	; QWERTY -_
-;SC00d = OEM_PLUS	1   	ъ   	Ъ   	--  	=   	+   	; QWERTY =+ - Rulemak ъЪ
+;SC00c = QW_MN   	0   	-   	_   	--  	--    	--  	; QWERTY -_
+;SC00d = QW_EQ   	1   	ъ   	Ъ   	--  	=   	+   	; QWERTY =+ - Rulemak ъЪ
 
 SC010 = Q       	5   	я   	Я   	--  	q   	Q   	; QWERTY qQ
 SC011 = W       	5   	ж   	Ж   	--  	w   	W   	; QWERTY wW
@@ -82,9 +82,9 @@ SC015 = J       	5   	й   	Й   	--  	j   	J   	; QWERTY yY
 SC016 = L       	5   	л   	Л   	--  	l   	L   	; QWERTY uU
 SC017 = U       	5   	у   	У   	--  	u   	U   	; QWERTY iI
 SC018 = Y       	5   	ъ   	Ъ   	--  	y   	Y   	; QWERTY oO - Rulemak ыЫ
-SC019 = OEM_1   	1   	;   	:   	--  	ы   	Ы   	; QWERTY pP - Rulemak юЮ
-SC01a = OEM_4   	1   	ш   	Ш   	--  	[   	{   	; QWERTY [{ - Rulemak шШ «{
-SC01b = OEM_6   	1   	щ   	Щ   	--  	]   	}   	; QWERTY ]} - Rulemak щЩ »}
+SC019 = QW_SC   	1   	;   	:   	--  	ы   	Ы   	; QWERTY pP - Rulemak юЮ
+SC01a = QW_LB   	1   	ш   	Ш   	--  	[   	{   	; QWERTY [{ - Rulemak шШ «{
+SC01b = QW_RB   	1   	щ   	Щ   	--  	]   	}   	; QWERTY ]} - Rulemak щЩ »}
 
 SC01e = A       	5   	а   	А   	--  	a   	A   	; QWERTY aA
 SC01f = R       	5   	р   	Р   	--  	r   	R   	; QWERTY sS
@@ -96,20 +96,20 @@ SC024 = N       	5   	н   	Н   	--  	n   	N   	; QWERTY jJ
 SC025 = E       	5   	е   	Е   	--  	e   	E   	; QWERTY kK
 SC026 = I       	5   	и   	И   	--  	i   	I   	; QWERTY lL
 SC027 = O       	5   	о   	О   	--  	o   	O   	; QWERTY ;:
-SC028 = OEM_7   	4   	'   	"   	--  	э   	Э   	; QWERTY '" - Rulemak ьЬ '"
-SC02b = OEM_5   	4   	ю   	Ю   	--  	\   	|   	; QWERTY \| - Rulemak эЭ
+SC028 = QW_QU   	4   	'   	"   	--  	э   	Э   	; QWERTY '" - Rulemak ьЬ '"
+SC02b = QW_BS   	4   	ю   	Ю   	--  	\   	|   	; QWERTY \| - Rulemak эЭ
 
+SC056 = QW_LG   	0   	̀    	@0a8	--  	̀    	—   	; QWERTY QW_102 - Rulemak ́ ̋
 SC02c = Z       	5   	з   	З   	--  	z   	Z   	; QWERTY zZ
 SC02d = X       	5   	ч   	Ч   	--  	x   	X   	; QWERTY xX - Rulemak хХ
 SC02e = C       	5   	ц   	Ц   	--  	c   	C   	; QWERTY cC
 SC02f = V       	5   	в   	В   	--  	v   	V   	; QWERTY vV
 SC030 = B       	5   	б   	Б   	--  	b   	B   	; QWERTY bB
 SC031 = K       	5   	к   	К   	--  	k   	K   	; QWERTY nN
 SC032 = M       	5   	м   	М   	--  	m   	M   	; QWERTY mM
-;SC033 = OEM_COMMA	0   	,   	;   	--  	<   	--  	; QWERTY ,<
-;SC034 = OEM_PERIOD	0   	.   	:   	--  	>   	--  	; QWERTY .>
-;SC035 = OEM_2   	0   	/   	?   	--  	--  	--  	; QWERTY /?
-SC056 = OEM_102 	0   	̀    	@0a8	--  	̀    	—   	; QWERTY OEM_102 - Rulemak ́ ̋
+;SC033 = QW_CM   	0   	,   	;   	--  	<   	--  	; QWERTY ,<
+;SC034 = QW_DT   	0   	.   	:   	--  	>   	--  	; QWERTY .>
+;SC035 = QW_SL   	0   	/   	?   	--  	--  	--  	; QWERTY /?
 
 [deadKeyNames]
 ;;  Names listed in this section will override those in the deadkey tables file.