diff --git a/src/main/scala/opening/OpeningDbPartA.scala b/src/main/scala/opening/OpeningDbPartA.scala
index a5e21e90f..7a78d6faa 100644
--- a/src/main/scala/opening/OpeningDbPartA.scala
+++ b/src/main/scala/opening/OpeningDbPartA.scala
@@ -287,9 +287,9 @@ Opening("A10", "English Opening: Wade Gambit", "rnbqkbnr/ppppp1pp/8/5p2/2P3P1/8/
 Opening("A10", "English Opening: Zilbermints Gambit", "rnbqkbnr/pppp1p1p/8/4p1p1/2PP4/8/PP2PPPP/RNBQKBNR w KQkq -", "c2c4 g7g5 d2d4 e7e5", "1. c4 g5 2. d4 e5"),
 Opening("A11", "English Opening: Caro-Kann Defensive System", "rnbqkbnr/pp1ppppp/2p5/8/2P5/8/PP1PPPPP/RNBQKBNR w KQkq -", "c2c4 c7c6", "1. c4 c6"),
 Opening("A12", "Réti Opening: Anglo-Slav Variation, Bled Variation", "rnbqkb1r/pp2pp1p/2p2np1/3p4/2P5/1P3N2/PB1PPPPP/RN1QKB1R w KQkq -", "g1f3 d7d5 b2b3 g8f6 c1b2 g7g6 c2c4 c7c6", "1. Nf3 d5 2. b3 Nf6 3. Bb2 g6 4. c4 c6"),
-Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubov Variation", "rnbqkbnr/pp2pppp/2p5/3p4/2P5/1P3N2/P2PPPPP/RNBQKB1R b KQkq -", "g1f3 d7d5 c2c4 c7c6 b2b3", "1. Nf3 d5 2. c4 c6 3. b3"),
-Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubov Variation", "rn1qkbnr/pp2pppp/2p5/3p4/2P3b1/1P3N2/P2PPPPP/RNBQKB1R w KQkq -", "g1f3 d7d5 c2c4 c7c6 b2b3 c8g4", "1. Nf3 d5 2. c4 c6 3. b3 Bg4"),
-Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubov Variation", "rnbqkb1r/pp2pppp/2p2n2/3p4/2P5/1P3N2/PB1PPPPP/RN1QKB1R b KQkq -", "g1f3 g8f6 c2c4 c7c6 b2b3 d7d5 c1b2", "1. Nf3 Nf6 2. c4 c6 3. b3 d5 4. Bb2"),
+Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubow Variation", "rnbqkbnr/pp2pppp/2p5/3p4/2P5/1P3N2/P2PPPPP/RNBQKB1R b KQkq -", "g1f3 d7d5 c2c4 c7c6 b2b3", "1. Nf3 d5 2. c4 c6 3. b3"),
+Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubow Variation", "rn1qkbnr/pp2pppp/2p5/3p4/2P3b1/1P3N2/P2PPPPP/RNBQKB1R w KQkq -", "g1f3 d7d5 c2c4 c7c6 b2b3 c8g4", "1. Nf3 d5 2. c4 c6 3. b3 Bg4"),
+Opening("A12", "Réti Opening: Anglo-Slav Variation, Bogoljubow Variation", "rnbqkb1r/pp2pppp/2p2n2/3p4/2P5/1P3N2/PB1PPPPP/RN1QKB1R b KQkq -", "g1f3 g8f6 c2c4 c7c6 b2b3 d7d5 c1b2", "1. Nf3 Nf6 2. c4 c6 3. b3 d5 4. Bb2"),
 Opening("A12", "Réti Opening: Anglo-Slav Variation, Capablanca Variation", "rn1qkb1r/pp2pppp/2p2n2/3p4/2P3b1/1P3N2/PB1PPPPP/RN1QKB1R w KQkq -", "c2c4 g8f6 g1f3 c7c6 b2b3 d7d5 c1b2 c8g4", "1. c4 Nf6 2. Nf3 c6 3. b3 d5 4. Bb2 Bg4"),
 Opening("A12", "Réti Opening: Anglo-Slav Variation, London Defensive System", "rn1qkb1r/pp2pppp/2p2n2/3p1b2/2P5/1P3NP1/P2PPP1P/RNBQKB1R w KQkq -", "c2c4 g8f6 g2g3 c7c6 g1f3 d7d5 b2b3 c8f5", "1. c4 Nf6 2. g3 c6 3. Nf3 d5 4. b3 Bf5"),
 Opening("A12", "Réti Opening: Anglo-Slav Variation, New York System", "rn1qkb1r/pp2pppp/2p2n2/3p1b2/2P5/1P3N2/PB1PPPPP/RN1QKB1R w KQkq -", "g1f3 g8f6 c2c4 c7c6 b2b3 d7d5 c1b2 c8f5", "1. Nf3 Nf6 2. c4 c6 3. b3 d5 4. Bb2 Bf5"),
@@ -297,7 +297,7 @@ Opening("A12", "Réti Opening: Anglo-Slav Variation, Torre System", "rn1qkb1r/pp
 Opening("A13", "English Opening: Agincourt Defense", "rnbqkbnr/pppp1ppp/4p3/8/2P5/8/PP1PPPPP/RNBQKBNR w KQkq -", "c2c4 e7e6", "1. c4 e6"),
 Opening("A13", "English Opening: Agincourt Defense", "rnbqkbnr/pppp1ppp/4p3/8/2P5/5N2/PP1PPPPP/RNBQKB1R b KQkq -", "c2c4 e7e6 g1f3", "1. c4 e6 2. Nf3"),
 Opening("A13", "English Opening: Agincourt Defense", "rnbqkbnr/ppp2ppp/4p3/3p4/2P5/5N2/PP1PPPPP/RNBQKB1R w KQkq -", "c2c4 e7e6 g1f3 d7d5", "1. c4 e6 2. Nf3 d5"),
-Opening("A13", "English Opening: Agincourt Defense, Bogoljubov Defense", "rnbqk2r/ppp2ppp/3bpn2/3p4/2P5/5NP1/PP1PPPBP/RNBQK2R w KQkq -", "c2c4 e7e6 g1f3 d7d5 g2g3 g8f6 f1g2 f8d6", "1. c4 e6 2. Nf3 d5 3. g3 Nf6 4. Bg2 Bd6"),
+Opening("A13", "English Opening: Agincourt Defense, Bogoljubow Defense", "rnbqk2r/ppp2ppp/3bpn2/3p4/2P5/5NP1/PP1PPPBP/RNBQK2R w KQkq -", "c2c4 e7e6 g1f3 d7d5 g2g3 g8f6 f1g2 f8d6", "1. c4 e6 2. Nf3 d5 3. g3 Nf6 4. Bg2 Bd6"),
 Opening("A13", "English Opening: Agincourt Defense, Catalan Defense", "rn1qkbnr/pbp2ppp/1p2p3/3p4/2P5/5NP1/PP1PPPBP/RNBQ1RK1 b kq -", "c2c4 e7e6 g1f3 d7d5 g2g3 b7b6 f1g2 c8b7 e1g1", "1. c4 e6 2. Nf3 d5 3. g3 b6 4. Bg2 Bb7 5. O-O"),
 Opening("A13", "English Opening: Agincourt Defense, Catalan Defense", "rnbqkbnr/pp3ppp/4p3/2pp4/2P5/5NP1/PP1PPP1P/RNBQKB1R w KQkq -", "c2c4 e7e6 g1f3 d7d5 g2g3 c7c5", "1. c4 e6 2. Nf3 d5 3. g3 c5"),
 Opening("A13", "English Opening: Agincourt Defense, Catalan Defense Accepted", "rnbqkb1r/ppp2ppp/4pn2/8/2p5/5NP1/PP1PPPBP/RNBQK2R w KQkq -", "c2c4 e7e6 g1f3 g8f6 g2g3 d7d5 f1g2 d5c4", "1. c4 e6 2. Nf3 Nf6 3. g3 d5 4. Bg2 dxc4"),
@@ -310,7 +310,7 @@ Opening("A13", "English Opening: Neo-Catalan Declined", "rnbqk2r/ppp1bppp/4pn2/3
 Opening("A13", "English Opening: Romanishin Gambit", "rnbqkb1r/2pp1ppp/p3pn2/1p6/2P5/5NP1/PP1PPPBP/RNBQK2R w KQkq -", "c2c4 g8f6 g1f3 e7e6 g2g3 a7a6 f1g2 b7b5", "1. c4 Nf6 2. Nf3 e6 3. g3 a6 4. Bg2 b5"),
 Opening("A14", "English Opening: Agincourt Defense, Keres Defense", "r1bqk2r/pp2bppp/2n1p3/2pn4/8/2N2NP1/PP1PPPBP/R1BQ1RK1 w kq -", "c2c4 e7e6 g1f3 d7d5 g2g3 g8f6 f1g2 f8e7 e1g1 c7c5 c4d5 f6d5 b1c3 b8c6", "1. c4 e6 2. Nf3 d5 3. g3 Nf6 4. Bg2 Be7 5. O-O c5 6. cxd5 Nxd5 7. Nc3 Nc6"),
 Opening("A14", "English Opening: Agincourt Defense, Neo-Catalan Declined", "rnbqk2r/ppp1bppp/4pn2/3p4/2P5/5NP1/PP1PPPBP/RNBQ1RK1 b kq -", "c2c4 e7e6 g1f3 d7d5 g2g3 g8f6 f1g2 f8e7 e1g1", "1. c4 e6 2. Nf3 d5 3. g3 Nf6 4. Bg2 Be7 5. O-O"),
-Opening("A14", "Réti Opening: Anglo-Slav Variation, Bogoljubov Variation, Stonewall Line", "rnbq1rk1/pp2bppp/2p1pn2/3p4/2P5/1P3NP1/PB1PPPBP/RN1Q1RK1 b - -", "g1f3 d7d5 c2c4 e7e6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 b2b3 c7c6 c1b2", "1. Nf3 d5 2. c4 e6 3. g3 Nf6 4. Bg2 Be7 5. O-O O-O 6. b3 c6 7. Bb2"),
+Opening("A14", "Réti Opening: Anglo-Slav Variation, Bogoljubow Variation, Stonewall Line", "rnbq1rk1/pp2bppp/2p1pn2/3p4/2P5/1P3NP1/PB1PPPBP/RN1Q1RK1 b - -", "g1f3 d7d5 c2c4 e7e6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 b2b3 c7c6 c1b2", "1. Nf3 d5 2. c4 e6 3. g3 Nf6 4. Bg2 Be7 5. O-O O-O 6. b3 c6 7. Bb2"),
 Opening("A15", "English Opening: Anglo-Indian Defense", "rnbqkb1r/pppppppp/5n2/8/2P5/8/PP1PPPPP/RNBQKBNR w KQkq -", "c2c4 g8f6", "1. c4 Nf6"),
 Opening("A15", "English Opening: Anglo-Indian Defense, Anti-Anti-Grünfeld", "rnbqk2r/ppppppbp/5np1/8/2P1P3/2N2N2/PP1P1PPP/R1BQKB1R b KQkq -", "c2c4 g8f6 b1c3 g7g6 g1f3 f8g7 e2e4", "1. c4 Nf6 2. Nc3 g6 3. Nf3 Bg7 4. e4"),
 Opening("A15", "English Opening: Anglo-Indian Defense, Grünfeld Formation", "rnbqkb1r/ppp1pp1p/5np1/3p4/2P5/5NP1/PP1PPP1P/RNBQKB1R w KQkq -", "c2c4 g8f6 g1f3 g7g6 g2g3 d7d5", "1. c4 Nf6 2. Nf3 g6 3. g3 d5"),
diff --git a/src/main/scala/opening/OpeningDbPartB.scala b/src/main/scala/opening/OpeningDbPartB.scala
index ec9b8bc2d..27e5e2cd8 100644
--- a/src/main/scala/opening/OpeningDbPartB.scala
+++ b/src/main/scala/opening/OpeningDbPartB.scala
@@ -50,14 +50,14 @@ Opening("B00", "Nimzowitsch Defense: Pseudo-Spanish Variation", "r1bqkbnr/pppppp
 Opening("B00", "Nimzowitsch Defense: Scandinavian Variation", "r1bqkbnr/ppp1pppp/2n5/3p4/3PP3/8/PPP2PPP/RNBQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5", "1. e4 Nc6 2. d4 d5"),
 Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Aachen Gambit", "r1bqkbnr/ppp1pppp/8/3P4/1n1P4/8/PPP2PPP/RNBQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 e4d5 c6b4", "1. e4 Nc6 2. d4 d5 3. exd5 Nb4"),
 Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Advance Variation", "r1bqkbnr/ppp1pppp/2n5/3pP3/3P4/8/PPP2PPP/RNBQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 e4e5", "1. e4 Nc6 2. d4 d5 3. e5"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation", "r1bqkbnr/ppp1pppp/2n5/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3", "1. e4 Nc6 2. d4 d5 3. Nc3"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation", "r1bqkbnr/ppp1pppp/2n5/8/3Pp3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Brandics Gambit", "r1bqkbnr/1pp1pppp/p1n5/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 a7a6", "1. e4 Nc6 2. d4 d5 3. Nc3 a6"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Erben Gambit", "r1bqkbnr/ppp1pp1p/2n3p1/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 g7g6", "1. e4 Nc6 2. d4 d5 3. Nc3 g6"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Heinola-Deppe Gambit", "r1bqkbnr/ppp2ppp/2n5/3pp3/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 e7e5", "1. e4 Nc6 2. d4 d5 3. Nc3 e5"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Nimzowitsch Gambit", "r1bqkbnr/ppp1pppp/8/3Pn3/4p3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4 d4d5 c6e5", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4 4. d5 Ne5"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Richter Gambit", "rnbqkbnr/ppp1pppp/8/3P4/4p3/2N2P2/PPP3PP/R1BQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4 d4d5 c6b8 f2f3", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4 4. d5 Nb8 5. f3"),
-Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubov Variation, Vehre Variation", "r1bqkb1r/ppp1pppp/2n2n2/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 g8f6", "1. e4 Nc6 2. d4 d5 3. Nc3 Nf6"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation", "r1bqkbnr/ppp1pppp/2n5/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3", "1. e4 Nc6 2. d4 d5 3. Nc3"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation", "r1bqkbnr/ppp1pppp/2n5/8/3Pp3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Brandics Gambit", "r1bqkbnr/1pp1pppp/p1n5/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 a7a6", "1. e4 Nc6 2. d4 d5 3. Nc3 a6"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Erben Gambit", "r1bqkbnr/ppp1pp1p/2n3p1/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 g7g6", "1. e4 Nc6 2. d4 d5 3. Nc3 g6"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Heinola-Deppe Gambit", "r1bqkbnr/ppp2ppp/2n5/3pp3/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 e7e5", "1. e4 Nc6 2. d4 d5 3. Nc3 e5"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Nimzowitsch Gambit", "r1bqkbnr/ppp1pppp/8/3Pn3/4p3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4 d4d5 c6e5", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4 4. d5 Ne5"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Richter Gambit", "rnbqkbnr/ppp1pppp/8/3P4/4p3/2N2P2/PPP3PP/R1BQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 d5e4 d4d5 c6b8 f2f3", "1. e4 Nc6 2. d4 d5 3. Nc3 dxe4 4. d5 Nb8 5. f3"),
+Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Bogoljubow Variation, Vehre Variation", "r1bqkb1r/ppp1pppp/2n2n2/3p4/3PP3/2N5/PPP2PPP/R1BQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 b1c3 g8f6", "1. e4 Nc6 2. d4 d5 3. Nc3 Nf6"),
 Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Exchange Variation", "r1b1kbnr/ppp1pppp/2n5/3q4/3P4/8/PPP2PPP/RNBQKBNR w KQkq -", "e2e4 b8c6 d2d4 d7d5 e4d5 d8d5", "1. e4 Nc6 2. d4 d5 3. exd5 Qxd5"),
 Opening("B00", "Nimzowitsch Defense: Scandinavian Variation, Exchange Variation, Marshall Gambit", "r1b1kbnr/ppp1pppp/2n5/3q4/3P4/2N5/PPP2PPP/R1BQKBNR b KQkq -", "e2e4 b8c6 d2d4 d7d5 e4d5 d8d5 b1c3", "1. e4 Nc6 2. d4 d5 3. exd5 Qxd5 4. Nc3"),
 Opening("B00", "Nimzowitsch Defense: Wheeler Gambit", "r1bqkbnr/pppppppp/2n5/8/1P2P3/8/P1PP1PPP/RNBQKBNR b KQkq -", "e2e4 b8c6 b2b4", "1. e4 Nc6 2. b4"),
diff --git a/src/main/scala/opening/OpeningDbPartC.scala b/src/main/scala/opening/OpeningDbPartC.scala
index a41237c40..59bbfc800 100644
--- a/src/main/scala/opening/OpeningDbPartC.scala
+++ b/src/main/scala/opening/OpeningDbPartC.scala
@@ -47,7 +47,7 @@ Opening("C00", "French Defense: Two Knights Variation", "rnbqkbnr/ppp2ppp/4p3/3p
 Opening("C00", "French Defense: Wing Gambit", "rnbqkbnr/pp3ppp/4p3/2ppP3/1P6/5N2/P1PP1PPP/RNBQKB1R b KQkq -", "e2e4 e7e6 g1f3 d7d5 e4e5 c7c5 b2b4", "1. e4 e6 2. Nf3 d5 3. e5 c5 4. b4"),
 Opening("C00", "Rat Defense: Small Center Defense", "rnbqkbnr/ppp2ppp/3pp3/8/3PP3/8/PPP2PPP/RNBQKBNR w KQkq -", "d2d4 e7e6 e2e4 d7d6", "1. d4 e6 2. e4 d6"),
 Opening("C01", "French Defense: Exchange Variation", "rnbqkbnr/ppp2ppp/4p3/3P4/3P4/8/PPP2PPP/RNBQKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 e4d5", "1. e4 e6 2. d4 d5 3. exd5"),
-Opening("C01", "French Defense: Exchange Variation, Bogoljubov Variation", "r1bqkb1r/ppp2ppp/2n2n2/3p2B1/3P4/2N5/PPP2PPP/R2QKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 e4d5 e6d5 b1c3 g8f6 c1g5 b8c6", "1. e4 e6 2. d4 d5 3. exd5 exd5 4. Nc3 Nf6 5. Bg5 Nc6"),
+Opening("C01", "French Defense: Exchange Variation, Bogoljubow Variation", "r1bqkb1r/ppp2ppp/2n2n2/3p2B1/3P4/2N5/PPP2PPP/R2QKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 e4d5 e6d5 b1c3 g8f6 c1g5 b8c6", "1. e4 e6 2. d4 d5 3. exd5 exd5 4. Nc3 Nf6 5. Bg5 Nc6"),
 Opening("C01", "French Defense: Exchange Variation, Monte Carlo Variation", "rnbqkbnr/ppp2ppp/8/3p4/2PP4/8/PP3PPP/RNBQKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 e4d5 e6d5 c2c4", "1. e4 e6 2. d4 d5 3. exd5 exd5 4. c4"),
 Opening("C01", "French Defense: Exchange Variation, Svenonius Variation", "rnbqkb1r/ppp2ppp/5n2/3p2B1/3P4/2N5/PPP2PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 e4d5 e6d5 c1g5", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. exd5 exd5 5. Bg5"),
 Opening("C02", "French Defense: Advance Variation", "rnbqkbnr/ppp2ppp/4p3/3pP3/3P4/8/PPP2PPP/RNBQKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 e4e5", "1. e4 e6 2. d4 d5 3. e5"),
@@ -117,7 +117,7 @@ Opening("C11", "French Defense: Steinitz Variation, Gledhill Attack", "rnbqkb1r/
 Opening("C12", "French Defense: MacCutcheon Variation", "rnbqk2r/ppp2ppp/4pn2/3p2B1/1b1PP3/2N5/PPP2PPP/R2QKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4"),
 Opening("C12", "French Defense: MacCutcheon Variation, Advance Variation", "rnbqk2r/ppp2ppp/4pn2/3pP1B1/1b1P4/2N5/PPP2PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4e5", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. e5"),
 Opening("C12", "French Defense: MacCutcheon Variation, Bernstein Variation", "rnbqk2r/ppp2pp1/4pn1p/3pP3/1b1P3B/2N5/PPP2PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4e5 h7h6 g5h4", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. e5 h6 6. Bh4"),
-Opening("C12", "French Defense: MacCutcheon Variation, Bogoljubov Variation", "rnb1k2r/ppp2p1p/4pp2/q7/1b1P4/2N5/PPPQ1PPP/R3KBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4d5 d8d5 g5f6 g7f6 d1d2 d5a5", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. exd5 Qxd5 6. Bxf6 gxf6 7. Qd2 Qa5"),
+Opening("C12", "French Defense: MacCutcheon Variation, Bogoljubow Variation", "rnb1k2r/ppp2p1p/4pp2/q7/1b1P4/2N5/PPPQ1PPP/R3KBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4d5 d8d5 g5f6 g7f6 d1d2 d5a5", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. exd5 Qxd5 6. Bxf6 gxf6 7. Qd2 Qa5"),
 Opening("C12", "French Defense: MacCutcheon Variation, Chigorin Variation", "rnbqk2r/ppp2pp1/4pP1p/3p2B1/1b1P4/2N5/PPP2PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4e5 h7h6 e5f6", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. e5 h6 6. exf6"),
 Opening("C12", "French Defense: MacCutcheon Variation, Dr. Olland Variation", "rnbqk2r/ppp2pp1/4pn1p/3pP3/1b1P4/2N5/PPP2PPP/R1BQKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 g8f6 c1g5 f8b4 e4e5 h7h6 g5c1", "1. e4 e6 2. d4 d5 3. Nc3 Nf6 4. Bg5 Bb4 5. e5 h6 6. Bc1"),
 Opening("C12", "French Defense: MacCutcheon Variation, Duras Variation", "rnbq1k1r/ppp2pp1/4p2p/3pP3/3Pn1Q1/2P5/P1P2PPP/R1B1KBNR b KQ -", "e2e4 e7e6 b1c3 d7d5 d2d4 g8f6 c1g5 f8b4 e4e5 h7h6 g5d2 b4c3 b2c3 f6e4 d1g4 e8f8 d2c1", "1. e4 e6 2. Nc3 d5 3. d4 Nf6 4. Bg5 Bb4 5. e5 h6 6. Bd2 Bxc3 7. bxc3 Ne4 8. Qg4 Kf8 9. Bc1"),
@@ -166,8 +166,8 @@ Opening("C17", "French Defense: Winawer Variation, Advance Variation", "rnbqk1nr
 Opening("C17", "French Defense: Winawer Variation, Advance Variation", "rnbqk1nr/pp3ppp/4p3/2ppP3/1b1P4/P1N5/1PP2PPP/R1BQKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 a2a3", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. a3"),
 Opening("C17", "French Defense: Winawer Variation, Advance Variation", "rnbqk1nr/pp3ppp/4p3/3pP3/1P6/2p2N2/1PP2PPP/R1BQKB1R b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 a2a3 c5d4 a3b4 d4c3 g1f3", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. a3 cxd4 6. axb4 dxc3 7. Nf3"),
 Opening("C17", "French Defense: Winawer Variation, Advance Variation, Moscow Variation", "rnbqk1nr/pp3ppp/4p3/2ppP3/1b1P2Q1/2N5/PPP2PPP/R1B1KBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 d1g4", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. Qg4"),
-Opening("C17", "French Defense: Winawer Variation, Bogoljubov Variation", "rnbqk1nr/pp3ppp/4p3/2ppP3/1b1P4/2N5/PPPB1PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 c1d2", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. Bd2"),
-Opening("C17", "French Defense: Winawer Variation, Bogoljubov Variation, Icelandic Defense", "rnbqk2r/pp2nppp/4p3/2ppP3/1b1P1P2/2N5/PPPB2PP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 c1d2 g8e7 f2f4", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. Bd2 Ne7 6. f4"),
+Opening("C17", "French Defense: Winawer Variation, Bogoljubow Variation", "rnbqk1nr/pp3ppp/4p3/2ppP3/1b1P4/2N5/PPPB1PPP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 c1d2", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. Bd2"),
+Opening("C17", "French Defense: Winawer Variation, Bogoljubow Variation, Icelandic Defense", "rnbqk2r/pp2nppp/4p3/2ppP3/1b1P1P2/2N5/PPPB2PP/R2QKBNR b KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 c1d2 g8e7 f2f4", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. Bd2 Ne7 6. f4"),
 Opening("C17", "French Defense: Winawer Variation, Maróczy-Wallis Variation", "rnbqk1nr/pp3ppp/4p3/3pP3/1P6/2p5/1PP2PPP/R1BQKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 a2a3 c5d4 a3b4 d4c3", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. a3 cxd4 6. axb4 dxc3"),
 Opening("C17", "French Defense: Winawer Variation, Retreat Variation", "rnbqk1nr/pp3ppp/4p3/b1ppP3/3P4/P1N5/1PP2PPP/R1BQKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 a2a3 b4a5", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. a3 Ba5"),
 Opening("C17", "French Defense: Winawer Variation, Retreat Variation, Armenian Line", "rnbqk1nr/pp3ppp/4p3/b2pP3/1P1p4/P1N5/2P2PPP/R1BQKBNR w KQkq -", "e2e4 e7e6 d2d4 d7d5 b1c3 f8b4 e4e5 c7c5 a2a3 b4a5 b2b4 c5d4", "1. e4 e6 2. d4 d5 3. Nc3 Bb4 4. e5 c5 5. a3 Ba5 6. b4 cxd4"),
@@ -393,8 +393,8 @@ Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Anderssen Variation", "
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bledow Countergambit", "rnbqkb1r/ppp2ppp/5n2/3B4/4Pp2/8/PPPP2PP/RNBQK1NR w KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d7d5 c4d5 g8f6", "1. e4 e5 2. f4 exf4 3. Bc4 d5 4. Bxd5 Nf6"),
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bledow Variation", "rnbqkbnr/ppp2ppp/8/3p4/2B1Pp2/8/PPPP2PP/RNBQK1NR w KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d7d5", "1. e4 e5 2. f4 exf4 3. Bc4 d5"),
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Boden Variation", "r1b1kbnr/pppp1ppp/2n5/8/2B1Pp1q/8/PPPP2PP/RNBQ1KNR w kq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d8h4 e1f1 b8c6", "1. e4 e5 2. f4 exf4 3. Bc4 Qh4+ 4. Kf1 Nc6"),
-Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bogoljubov Defense", "rnbqkb1r/pp1p1ppp/2p2n2/8/2B1Pp2/2N5/PPPP2PP/R1BQK1NR w KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 g8f6 b1c3 c7c6", "1. e4 e5 2. f4 exf4 3. Bc4 Nf6 4. Nc3 c6"),
-Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bogoljubov Variation", "rnbqkb1r/pppp1ppp/5n2/8/2B1Pp2/2N5/PPPP2PP/R1BQK1NR b KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 g8f6 b1c3", "1. e4 e5 2. f4 exf4 3. Bc4 Nf6 4. Nc3"),
+Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bogoljubow Defense", "rnbqkb1r/pp1p1ppp/2p2n2/8/2B1Pp2/2N5/PPPP2PP/R1BQK1NR w KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 g8f6 b1c3 c7c6", "1. e4 e5 2. f4 exf4 3. Bc4 Nf6 4. Nc3 c6"),
+Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bogoljubow Variation", "rnbqkb1r/pppp1ppp/5n2/8/2B1Pp2/2N5/PPPP2PP/R1BQK1NR b KQkq -", "e2e4 e7e5 f2f4 e5f4 f1c4 g8f6 b1c3", "1. e4 e5 2. f4 exf4 3. Bc4 Nf6 4. Nc3"),
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Boren-Svenonius Variation", "rnb1k1nr/ppp2ppp/3b4/3B4/4Pp1q/8/PPPP2PP/RNBQ1KNR w kq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d7d5 c4d5 d8h4 e1f1 f8d6", "1. e4 e5 2. f4 exf4 3. Bc4 d5 4. Bxd5 Qh4+ 5. Kf1 Bd6"),
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Bryan Countergambit", "rnb1kbnr/p1pp1ppp/8/1p6/2B1Pp1q/8/PPPP2PP/RNBQ1KNR w kq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d8h4 e1f1 b7b5", "1. e4 e5 2. f4 exf4 3. Bc4 Qh4+ 4. Kf1 b5"),
 Opening("C33", "King's Gambit Accepted: Bishop's Gambit, Chigorin's Attack", "rnb1kbnr/ppp2p1p/8/3B2p1/4Pp1q/6P1/PPPP3P/RNBQ1KNR b kq -", "e2e4 e7e5 f2f4 e5f4 f1c4 d8h4 e1f1 d7d5 c4d5 g7g5 g2g3", "1. e4 e5 2. f4 exf4 3. Bc4 Qh4+ 4. Kf1 d5 5. Bxd5 g5 6. g3"),
@@ -944,7 +944,7 @@ Opening("C58", "Italian Game: Two Knights Defense, Maróczy Variation", "r1bqk2r
 Opening("C58", "Italian Game: Two Knights Defense, Paoli Variation", "r1b1kb1r/p1q2ppp/2p2n2/n3p1N1/8/3B1Q2/PPPP1PPP/RNB1K2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 c4b5 c7c6 d5c6 b7c6 d1f3 d8c7 b5d3", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. Bb5+ c6 7. dxc6 bxc6 8. Qf3 Qc7 9. Bd3"),
 Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense", "r1bqkb1r/ppp2ppp/5n2/n2Pp1N1/2B5/8/PPPP1PPP/RNBQK2R w KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5"),
 Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense, Bishop Check Line", "r1bqkb1r/ppp2ppp/5n2/nB1Pp1N1/8/8/PPPP1PPP/RNBQK2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 c4b5", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. Bb5+"),
-Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense, Bogoljubov Variation", "r1bqkb1r/p4ppp/2p2n2/nB2p1N1/8/5Q2/PPPP1PPP/RNB1K2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 c4b5 c7c6 d5c6 b7c6 d1f3", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. Bb5+ c6 7. dxc6 bxc6 8. Qf3"),
+Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense, Bogoljubow Variation", "r1bqkb1r/p4ppp/2p2n2/nB2p1N1/8/5Q2/PPPP1PPP/RNB1K2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 c4b5 c7c6 d5c6 b7c6 d1f3", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. Bb5+ c6 7. dxc6 bxc6 8. Qf3"),
 Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense, Kieseritzky Variation", "r1bqkb1r/ppp2ppp/5n2/n2Pp1N1/2B5/3P4/PPP2PPP/RNBQK2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 d2d3", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. d3"),
 Opening("C58", "Italian Game: Two Knights Defense, Polerio Defense, Yankovich Variation", "r1bqk2r/ppp2pp1/5n1p/2bP4/2P1p3/8/PPPNQPPP/RNB1K2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 d2d3 h7h6 g5f3 e5e4 d1e2 a5c4 d3c4 f8c5 f3d2", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. d3 h6 7. Nf3 e4 8. Qe2 Nxc4 9. dxc4 Bc5 10. Nfd2"),
 Opening("C59", "Italian Game: Two Knights Defense, Knorre Variation", "r1b1k2r/p1q2pp1/2pb1n1p/n3N3/3Pp3/8/PPPBBPPP/RN1QK2R b KQkq -", "e2e4 e7e5 g1f3 b8c6 f1c4 g8f6 f3g5 d7d5 e4d5 c6a5 c4b5 c7c6 d5c6 b7c6 b5e2 h7h6 g5f3 e5e4 f3e5 f8d6 d2d4 d8c7 c1d2", "1. e4 e5 2. Nf3 Nc6 3. Bc4 Nf6 4. Ng5 d5 5. exd5 Na5 6. Bb5+ c6 7. dxc6 bxc6 8. Be2 h6 9. Nf3 e4 10. Ne5 Bd6 11. d4 Qc7 12. Bd2"),
@@ -1152,7 +1152,7 @@ Opening("C90", "Ruy Lopez: Closed", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/4P3/1BP2N2/P
 Opening("C90", "Ruy Lopez: Closed, Lutikov Variation", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/4P3/2P2N2/PPBP1PPP/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 b3c2", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. Bc2"),
 Opening("C90", "Ruy Lopez: Closed, Pilnik Variation", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/4P3/1BPP1N2/PP3PPP/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 e8g8 d2d3 d7d6 c2c3", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 O-O 8. d3 d6 9. c3"),
 Opening("C90", "Ruy Lopez: Closed, Suetin Variation", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/4P3/PBP2N2/1P1P1PPP/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 a2a3", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. a3"),
-Opening("C91", "Ruy Lopez: Closed, Bogoljubov Variation", "r2q1rk1/2p1bppp/p1np1n2/1p2p3/3PP1b1/1BP2N2/PP3PPP/RNBQR1K1 w - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 d2d4 c8g4", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. d4 Bg4"),
+Opening("C91", "Ruy Lopez: Closed, Bogoljubow Variation", "r2q1rk1/2p1bppp/p1np1n2/1p2p3/3PP1b1/1BP2N2/PP3PPP/RNBQR1K1 w - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 d2d4 c8g4", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. d4 Bg4"),
 Opening("C91", "Ruy Lopez: Closed, Yates Variation", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/3PP3/1BP2N2/PP3PPP/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 d2d4", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. d4"),
 Opening("C91", "Ruy Lopez: Closed, Yates Variation, Short Attack", "r2q1rk1/2p1bppp/p1np1n2/1p2p3/P2PP1b1/1BP2N2/1P3PPP/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 d2d4 c8g4 a2a4", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. d4 Bg4 10. a4"),
 Opening("C92", "Ruy Lopez: Closed", "r1bq1rk1/2p1bppp/p1np1n2/1p2p3/4P3/1BP2N1P/PP1P1PP1/RNBQR1K1 b - -", "e2e4 e7e5 g1f3 b8c6 f1b5 a7a6 b5a4 g8f6 e1g1 f8e7 f1e1 b7b5 a4b3 d7d6 c2c3 e8g8 h2h3", "1. e4 e5 2. Nf3 Nc6 3. Bb5 a6 4. Ba4 Nf6 5. O-O Be7 6. Re1 b5 7. Bb3 d6 8. c3 O-O 9. h3"),
diff --git a/src/main/scala/opening/OpeningDbPartD.scala b/src/main/scala/opening/OpeningDbPartD.scala
index f69fd19f0..ceb2d7a01 100644
--- a/src/main/scala/opening/OpeningDbPartD.scala
+++ b/src/main/scala/opening/OpeningDbPartD.scala
@@ -110,7 +110,7 @@ Opening("D05", "Queen's Pawn Game: Colle System", "rnbqkb1r/ppp2ppp/4pn2/3p4/3P4
 Opening("D05", "Queen's Pawn Game: Colle System, Traditional Colle", "rnbqkb1r/pp3ppp/4pn2/2pp4/3P4/2PBPN2/PP3PPP/RNBQK2R b KQkq -", "d2d4 g8f6 g1f3 e7e6 e2e3 c7c5 f1d3 d7d5 c2c3", "1. d4 Nf6 2. Nf3 e6 3. e3 c5 4. Bd3 d5 5. c3"),
 Opening("D05", "Queen's Pawn Game: Zukertort Variation", "rnbqkb1r/pp3ppp/4pn2/2pp4/3P4/1P2PN2/P1PN1PPP/R1BQKB1R b KQkq -", "d2d4 d7d5 g1f3 c7c5 e2e3 g8f6 b1d2 e7e6 b2b3", "1. d4 d5 2. Nf3 c5 3. e3 Nf6 4. Nbd2 e6 5. b3"),
 Opening("D05", "Rubinstein Opening", "rnbqkb1r/pp3ppp/4pn2/2pp4/3P4/1P1BPN2/P1P2PPP/RNBQK2R b KQkq -", "d2d4 g8f6 g1f3 e7e6 e2e3 c7c5 f1d3 d7d5 b2b3", "1. d4 Nf6 2. Nf3 e6 3. e3 c5 4. Bd3 d5 5. b3"),
-Opening("D05", "Rubinstein Opening: Bogoljubov Defense", "r1bq1rk1/pp3ppp/2nbpn2/2pp4/3P4/1P1BPN2/PBP2PPP/RN1Q1RK1 w - -", "d2d4 g8f6 g1f3 e7e6 e2e3 c7c5 f1d3 d7d5 b2b3 b8c6 e1g1 f8d6 c1b2 e8g8", "1. d4 Nf6 2. Nf3 e6 3. e3 c5 4. Bd3 d5 5. b3 Nc6 6. O-O Bd6 7. Bb2 O-O"),
+Opening("D05", "Rubinstein Opening: Bogoljubow Defense", "r1bq1rk1/pp3ppp/2nbpn2/2pp4/3P4/1P1BPN2/PBP2PPP/RN1Q1RK1 w - -", "d2d4 g8f6 g1f3 e7e6 e2e3 c7c5 f1d3 d7d5 b2b3 b8c6 e1g1 f8d6 c1b2 e8g8", "1. d4 Nf6 2. Nf3 e6 3. e3 c5 4. Bd3 d5 5. b3 Nc6 6. O-O Bd6 7. Bb2 O-O"),
 Opening("D05", "Rubinstein Opening: Classical Defense", "r1bq1rk1/pp2bppp/2n1pn2/2pp4/3P4/1P1BPN2/PBP2PPP/RN1Q1RK1 w - -", "d2d4 g8f6 g1f3 e7e6 e2e3 c7c5 f1d3 d7d5 b2b3 b8c6 e1g1 f8e7 c1b2 e8g8", "1. d4 Nf6 2. Nf3 e6 3. e3 c5 4. Bd3 d5 5. b3 Nc6 6. O-O Be7 7. Bb2 O-O"),
 Opening("D05", "Rubinstein Opening: Semi-Slav Defense", "r1bq1rk1/pppn1ppp/3bpn2/3p4/3P4/1P1BPN2/PBP2PPP/RN1Q1RK1 b - -", "d2d4 d7d5 g1f3 g8f6 e2e3 e7e6 f1d3 f8d6 e1g1 e8g8 b2b3 b8d7 c1b2", "1. d4 d5 2. Nf3 Nf6 3. e3 e6 4. Bd3 Bd6 5. O-O O-O 6. b3 Nbd7 7. Bb2"),
 Opening("D06", "Queen's Gambit", "rnbqkbnr/ppp1pppp/8/3p4/2PP4/8/PP2PPPP/RNBQKBNR b KQkq -", "d2d4 d7d5 c2c4", "1. d4 d5 2. c4"),
@@ -224,7 +224,7 @@ Opening("D22", "Queen's Gambit Accepted: Alekhine Defense, Alatortsev Variation"
 Opening("D22", "Queen's Gambit Accepted: Alekhine Defense, Haberditz Variation", "rnbqkbnr/2p1pppp/p7/1p6/2pP4/4PN2/PP3PPP/RNBQKB1R w KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 a7a6 e2e3 b7b5", "1. d4 d5 2. c4 dxc4 3. Nf3 a6 4. e3 b5"),
 Opening("D23", "Queen's Gambit Accepted", "rnbqkb1r/ppp1pppp/5n2/8/2pP4/5N2/PP2PPPP/RNBQKB1R w KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6"),
 Opening("D23", "Queen's Gambit Accepted: Mannheim Variation", "rnbqkb1r/ppp1pppp/5n2/8/Q1pP4/5N2/PP2PPPP/RNB1KB1R b KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 d1a4", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. Qa4+"),
-Opening("D24", "Queen's Gambit Accepted: Bogoljubov Defense", "rnbqkb1r/1pp1pppp/p4n2/8/2pPP3/2N2N2/PP3PPP/R1BQKB1R b KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 b1c3 a7a6 e2e4", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. Nc3 a6 5. e4"),
+Opening("D24", "Queen's Gambit Accepted: Bogoljubow Defense", "rnbqkb1r/1pp1pppp/p4n2/8/2pPP3/2N2N2/PP3PPP/R1BQKB1R b KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 b1c3 a7a6 e2e4", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. Nc3 a6 5. e4"),
 Opening("D24", "Queen's Gambit Accepted: Gunsberg Defense, Prianishenmo Gambit", "rnbqkb1r/pp3ppp/5n2/2ppP3/2p5/2N2N2/PP3PPP/R1BQKB1R b KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 b1c3 c7c5 d4d5 e7e6 e2e4 e6d5 e4e5", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. Nc3 c5 5. d5 e6 6. e4 exd5 7. e5"),
 Opening("D24", "Queen's Gambit Accepted: Showalter Variation", "rnbqkb1r/ppp1pppp/5n2/8/2pP4/2N2N2/PP2PPPP/R1BQKB1R b KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 b1c3", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. Nc3"),
 Opening("D25", "Queen's Gambit Accepted: Janowski-Larsen Variation", "rn1qkb1r/ppp1pppp/5n2/8/2pP2b1/4PN2/PP3PPP/RNBQKB1R w KQkq -", "d2d4 d7d5 c2c4 d5c4 g1f3 g8f6 e2e3 c8g4", "1. d4 d5 2. c4 dxc4 3. Nf3 Nf6 4. e3 Bg4"),
@@ -297,7 +297,7 @@ Opening("D33", "Tarrasch Defense: Wagner Variation", "r2qkb1r/pp3ppp/2n2n2/2pp4/
 Opening("D34", "Queen's Gambit Declined: Tarrasch Defense, Stoltz Variation", "r2q1rk1/p3bppp/1pn1bn2/2pp2B1/3P4/2N2NP1/PP2PPBP/2RQ1RK1 w - -", "d2d4 d7d5 c2c4 e7e6 g1f3 c7c5 c4d5 e6d5 g2g3 b8c6 f1g2 g8f6 e1g1 f8e7 b1c3 e8g8 c1g5 c8e6 a1c1 b7b6", "1. d4 d5 2. c4 e6 3. Nf3 c5 4. cxd5 exd5 5. g3 Nc6 6. Bg2 Nf6 7. O-O Be7 8. Nc3 O-O 9. Bg5 Be6 10. Rc1 b6"),
 Opening("D34", "Tarrasch Defense: Classical Variation", "r1bq1rk1/pp2bppp/2n2n2/2pp4/3P4/2N2NP1/PP2PPBP/R1BQ1RK1 w - -", "d2d4 d7d5 c2c4 e7e6 b1c3 c7c5 c4d5 e6d5 g1f3 b8c6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8", "1. d4 d5 2. c4 e6 3. Nc3 c5 4. cxd5 exd5 5. Nf3 Nc6 6. g3 Nf6 7. Bg2 Be7 8. O-O O-O"),
 Opening("D34", "Tarrasch Defense: Classical Variation, Advance Variation", "r1bq1rk1/pp2bppp/2n2n2/3p2B1/2pP4/2N2NP1/PP2PPBP/R2Q1RK1 w - -", "d2d4 d7d5 c2c4 e7e6 b1c3 c7c5 c4d5 e6d5 g1f3 b8c6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 c1g5 c5c4", "1. d4 d5 2. c4 e6 3. Nc3 c5 4. cxd5 exd5 5. Nf3 Nc6 6. g3 Nf6 7. Bg2 Be7 8. O-O O-O 9. Bg5 c4"),
-Opening("D34", "Tarrasch Defense: Classical Variation, Bogoljubov Variation", "r2q1rk1/pp2bppp/2n1bn2/3p2B1/2pP4/2N2NP1/PP2PPBP/2RQ1RK1 w - -", "d2d4 g8f6 c2c4 e7e6 b1c3 c7c5 g1f3 d7d5 c4d5 e6d5 g2g3 b8c6 f1g2 f8e7 e1g1 e8g8 c1g5 c8e6 a1c1 c5c4", "1. d4 Nf6 2. c4 e6 3. Nc3 c5 4. Nf3 d5 5. cxd5 exd5 6. g3 Nc6 7. Bg2 Be7 8. O-O O-O 9. Bg5 Be6 10. Rc1 c4"),
+Opening("D34", "Tarrasch Defense: Classical Variation, Bogoljubow Variation", "r2q1rk1/pp2bppp/2n1bn2/3p2B1/2pP4/2N2NP1/PP2PPBP/2RQ1RK1 w - -", "d2d4 g8f6 c2c4 e7e6 b1c3 c7c5 g1f3 d7d5 c4d5 e6d5 g2g3 b8c6 f1g2 f8e7 e1g1 e8g8 c1g5 c8e6 a1c1 c5c4", "1. d4 Nf6 2. c4 e6 3. Nc3 c5 4. Nf3 d5 5. cxd5 exd5 6. g3 Nc6 7. Bg2 Be7 8. O-O O-O 9. Bg5 Be6 10. Rc1 c4"),
 Opening("D34", "Tarrasch Defense: Classical Variation, Carlsbad Variation", "r1bq1rk1/pp2bppp/2n2n2/2pp2B1/3P4/2N2NP1/PP2PPBP/R2Q1RK1 b - -", "d2d4 d7d5 c2c4 e7e6 b1c3 c7c5 c4d5 e6d5 g1f3 b8c6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 c1g5", "1. d4 d5 2. c4 e6 3. Nc3 c5 4. cxd5 exd5 5. Nf3 Nc6 6. g3 Nf6 7. Bg2 Be7 8. O-O O-O 9. Bg5"),
 Opening("D34", "Tarrasch Defense: Classical Variation, Chandler Variation", "r2qr1k1/pp2bpp1/2n1bn1p/3p4/3N4/2N1B1P1/PP2PPBP/2RQ1RK1 w - -", "d2d4 d7d5 c2c4 e7e6 b1c3 c7c5 c4d5 e6d5 g1f3 b8c6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 c1g5 c5d4 f3d4 h7h6 g5e3 f8e8 a1c1 c8e6", "1. d4 d5 2. c4 e6 3. Nc3 c5 4. cxd5 exd5 5. Nf3 Nc6 6. g3 Nf6 7. Bg2 Be7 8. O-O O-O 9. Bg5 cxd4 10. Nxd4 h6 11. Be3 Re8 12. Rc1 Be6"),
 Opening("D34", "Tarrasch Defense: Classical Variation, Classical Tarrasch Gambit", "r1bq1rk1/pp2bppp/2n2n2/2P5/3p4/2N2NP1/PP2PPBP/R1BQ1RK1 w - -", "d2d4 d7d5 c2c4 e7e6 b1c3 c7c5 c4d5 e6d5 g1f3 b8c6 g2g3 g8f6 f1g2 f8e7 e1g1 e8g8 d4c5 d5d4", "1. d4 d5 2. c4 e6 3. Nc3 c5 4. cxd5 exd5 5. Nf3 Nc6 6. g3 Nf6 7. Bg2 Be7 8. O-O O-O 9. dxc5 d4"),
@@ -364,7 +364,7 @@ Opening("D45", "Semi-Slav Defense: Stoltz Variation, Center Variation", "r1bqk2r
 Opening("D45", "Semi-Slav Defense: Stoltz Variation, Center Variation, Mikhalchishin Line", "r1bqk2r/pp1n1ppp/2pb4/4P3/2P1Q3/5N2/PP3PPP/R1B1KB1R b KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 e2e3 b8d7 d1c2 f8d6 e3e4 d5e4 c3e4 f6e4 c2e4 e6e5 d4e5", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. e3 Nbd7 6. Qc2 Bd6 7. e4 dxe4 8. Nxe4 Nxe4 9. Qxe4 e5 10. dxe5"),
 Opening("D45", "Semi-Slav Defense: Stoltz Variation, Shabalov Attack", "r1bqk2r/pp1n1ppp/2pbpn2/3p4/2PP2P1/2N1PN2/PPQ2P1P/R1B1KB1R b KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 e2e3 b8d7 d1c2 f8d6 g2g4", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. e3 Nbd7 6. Qc2 Bd6 7. g4"),
 Opening("D45", "Semi-Slav Defense: Stonewall Defense", "rnbqkb1r/pp4pp/2p1p3/3p1p2/2PPn3/2NBPN2/PP3PPP/R1BQK2R w KQkq -", "d2d4 d7d5 g1f3 g8f6 c2c4 c7c6 b1c3 e7e6 e2e3 f6e4 f1d3 f7f5", "1. d4 d5 2. Nf3 Nf6 3. c4 c6 4. Nc3 e6 5. e3 Ne4 6. Bd3 f5"),
-Opening("D46", "Semi-Slav Defense: Bogoljubov Variation", "r1bqk2r/pp1nbppp/2p1pn2/3p4/2PP4/2NBPN2/PP3PPP/R1BQK2R w KQkq -", "d2d4 d7d5 c2c4 c7c6 b1c3 g8f6 e2e3 e7e6 g1f3 b8d7 f1d3 f8e7", "1. d4 d5 2. c4 c6 3. Nc3 Nf6 4. e3 e6 5. Nf3 Nbd7 6. Bd3 Be7"),
+Opening("D46", "Semi-Slav Defense: Bogoljubow Variation", "r1bqk2r/pp1nbppp/2p1pn2/3p4/2PP4/2NBPN2/PP3PPP/R1BQK2R w KQkq -", "d2d4 d7d5 c2c4 c7c6 b1c3 g8f6 e2e3 e7e6 g1f3 b8d7 f1d3 f8e7", "1. d4 d5 2. c4 c6 3. Nc3 Nf6 4. e3 e6 5. Nf3 Nbd7 6. Bd3 Be7"),
 Opening("D46", "Semi-Slav Defense: Chigorin Defense", "r1bqk2r/pp1n1ppp/2pbpn2/3p4/2PP4/2NBPN2/PP3PPP/R1BQK2R w KQkq -", "d2d4 d7d5 c2c4 c7c6 b1c3 g8f6 e2e3 e7e6 g1f3 b8d7 f1d3 f8d6", "1. d4 d5 2. c4 c6 3. Nc3 Nf6 4. e3 e6 5. Nf3 Nbd7 6. Bd3 Bd6"),
 Opening("D46", "Semi-Slav Defense: Chigorin Defense", "r1bqk2r/pp1n1ppp/2pbpn2/3p4/2PP4/2NBPN2/PPQ2PPP/R1B1K2R b KQkq -", "d2d4 d7d5 c2c4 c7c6 b1c3 g8f6 e2e3 e7e6 g1f3 b8d7 f1d3 f8d6 d1c2", "1. d4 d5 2. c4 c6 3. Nc3 Nf6 4. e3 e6 5. Nf3 Nbd7 6. Bd3 Bd6 7. Qc2"),
 Opening("D46", "Semi-Slav Defense: Main Line", "r1bqkb1r/pp1n1ppp/2p1pn2/3p4/2PP4/2NBPN2/PP3PPP/R1BQK2R b KQkq -", "d2d4 d7d5 c2c4 c7c6 b1c3 g8f6 e2e3 e7e6 g1f3 b8d7 f1d3", "1. d4 d5 2. c4 c6 3. Nc3 Nf6 4. e3 e6 5. Nf3 Nbd7 6. Bd3"),
@@ -403,7 +403,7 @@ Opening("D52", "Queen's Gambit Declined", "r1bqkb1r/pp1n1ppp/2p1pn2/3p2B1/2PP4/2
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense", "r1b1kb1r/pp1n1ppp/2p1pn2/q2p2B1/2PP4/2N1PN2/PP3PPP/R2QKB1R w KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5"),
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense", "r1b1kb1r/pp1n1ppp/2p1pn2/q2P2B1/3P4/2N1PN2/PP3PPP/R2QKB1R b KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5 c4d5", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5 7. cxd5"),
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Argentine Variation", "r1b2rk1/pp1n1ppp/2p1pn2/q2p4/1bPP3B/2N1P3/PPQN1PPP/R3KB1R b KQ -", "d2d4 d7d5 c2c4 e7e6 b1c3 g8f6 c1g5 b8d7 e2e3 c7c6 g1f3 d8a5 f3d2 f8b4 d1c2 e8g8 g5h4", "1. d4 d5 2. c4 e6 3. Nc3 Nf6 4. Bg5 Nbd7 5. e3 c6 6. Nf3 Qa5 7. Nd2 Bb4 8. Qc2 O-O 9. Bh4"),
-Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Bogoljubov Variation", "r1b1k2r/pp1n1ppp/2p1pn2/q2p2B1/1bPP4/2N1P3/PPQN1PPP/R3KB1R b KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5 f3d2 f8b4 d1c2", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5 7. Nd2 Bb4 8. Qc2"),
+Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Bogoljubow Variation", "r1b1k2r/pp1n1ppp/2p1pn2/q2p2B1/1bPP4/2N1P3/PPQN1PPP/R3KB1R b KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5 f3d2 f8b4 d1c2", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5 7. Nd2 Bb4 8. Qc2"),
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Capablanca Variation", "r1b1kb1r/pp1n1ppp/2p1pB2/q2p4/2PP4/2N1PN2/PP3PPP/R2QKB1R b KQkq -", "d2d4 d7d5 c2c4 e7e6 b1c3 g8f6 c1g5 b8d7 e2e3 c7c6 g1f3 d8a5 g5f6", "1. d4 d5 2. c4 e6 3. Nc3 Nf6 4. Bg5 Nbd7 5. e3 c6 6. Nf3 Qa5 7. Bxf6"),
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Rubinstein Variation", "r1b1kb1r/pp1n1ppp/2p1pn2/q5B1/2pP4/2N1P3/PP1N1PPP/R2QKB1R w KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5 f3d2 d5c4", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5 7. Nd2 dxc4"),
 Opening("D52", "Queen's Gambit Declined: Cambridge Springs Defense, Yugoslav Variation", "r1b1kb1r/pp1n1ppp/2p1p3/q2n2B1/3P4/2N1PN2/PP3PPP/R2QKB1R w KQkq -", "d2d4 d7d5 c2c4 c7c6 g1f3 g8f6 b1c3 e7e6 c1g5 b8d7 e2e3 d8a5 c4d5 f6d5", "1. d4 d5 2. c4 c6 3. Nf3 Nf6 4. Nc3 e6 5. Bg5 Nbd7 6. e3 Qa5 7. cxd5 Nxd5"),