diff --git a/features/common.fea b/features/common.fea
index 0092f53..16a91fa 100644
--- a/features/common.fea
+++ b/features/common.fea
@@ -81,7 +81,11 @@ feature cv07 { script latn; sub l by l.serifed; } cv07;
 feature cv08 { script latn; sub l by l.italic; } cv08;
 feature cv09 { script latn; sub l by l.hooky; } cv09;
 feature cv10 { script latn; sub l by l.zshaped; } cv10;
+feature cv11 { script latn; sub g by g.doublestorey; } cv11;
+feature cv12 { script latn; sub g by g.singlestorey; } cv12;
 
 feature ss01 { script latn; sub [i l] by [i.serifed l.serifed]; } ss01;
 feature ss02 { script latn; sub [i l] by [i.hooky l.hooky]; } ss02;
-feature ss03 { script latn; sub [i l] by [i.zshaped l.zshaped]; } ss03;
\ No newline at end of file
+feature ss03 { script latn; sub [i l] by [i.zshaped l.zshaped]; } ss03;
+feature ss04 { script latn; sub g by g.doublestorey; } ss04;
+feature ss05 { script latn; sub g by g.singlestorey; } ss05;
\ No newline at end of file
diff --git a/glyphs/letters-unified-extended.aki b/glyphs/letters-unified-extended.aki
index 75f6ade..43acf1c 100644
--- a/glyphs/letters-unified-extended.aki
+++ b/glyphs/letters-unified-extended.aki
@@ -269,7 +269,7 @@ symbol-block 'Theta'
 		assign-unicode 0x398
 		include capitalMarks
 		include glyphs.O AS_BASE
-		include : HBar (SB + STROKE * CORRECTION_HX - O * 5) (RIGHTSB - STROKE * CORRECTION_HX + O * 5) CAPMIDDLE
+		include : HBar (SB + STROKE * CORRECTION_HX - O * 3) (RIGHTSB - STROKE * CORRECTION_HX + O * 3) CAPMIDDLE
 	create-glyph 'theta' : glyph-construction
 		assign-unicode 0x3B8
 		include bMarks