diff --git a/data/Constraint_Contours.js b/data/Constraint_Contours.js
index c198d89..8f83e62 100644
--- a/data/Constraint_Contours.js
+++ b/data/Constraint_Contours.js
@@ -1,55 +1,47 @@
 const OscProbConstraintData = {
-  T2K2018: {
-    Expt: "T2K",
-    Year: "2018",
-    Ref: "PRL 121, 171802",
-    S2Th23_Dm2_Atm: {
-      68: {
-        Dm2_Atm: [
-          [
-            0.0024969, 0.0025203, 0.0025364, 0.0025481, 0.0025554, 0.0025612,
-            0.0025626, 0.0025596, 0.0025478, 0.0025287, 0.0025038, 0.0024789,
-            0.0024628, 0.0024510, 0.0024247, 0.0024027, 0.0023808, 0.0023662,
-            0.0023501, 0.0023487, 0.0023517, 0.0023606, 0.0023767, 0.0023958,
-            0.0024193, 0.0024457, 0.0024735, 0.0024969
-          ]
-        ],
-        S2Th23: [
-          [
-            0.47673, 0.48347, 0.49204, 0.50245, 0.51224, 0.52327, 0.53796,
-            0.55020, 0.56000, 0.56735, 0.57102, 0.57224, 0.57163, 0.57102,
-            0.56735, 0.56245, 0.55510, 0.54714, 0.53245, 0.52143, 0.50980,
-            0.49878, 0.49020, 0.48347, 0.47735, 0.47490, 0.47490, 0.47673
-          ]
-        ]
+  T2K2018 : {
+    Expt : "T2K",
+    Year : "2018",
+    Ref : "PRL 121, 171802",
+    S2Th23_Dm2_Atm : {
+      68 : {
+        Dm2_Atm : [ [
+          0.0024969, 0.0025203, 0.0025364, 0.0025481, 0.0025554, 0.0025612,
+          0.0025626, 0.0025596, 0.0025478, 0.0025287, 0.0025038, 0.0024789,
+          0.0024628, 0.0024510, 0.0024247, 0.0024027, 0.0023808, 0.0023662,
+          0.0023501, 0.0023487, 0.0023517, 0.0023606, 0.0023767, 0.0023958,
+          0.0024193, 0.0024457, 0.0024735, 0.0024969
+        ] ],
+        S2Th23 : [ [
+          0.47673, 0.48347, 0.49204, 0.50245, 0.51224, 0.52327, 0.53796,
+          0.55020, 0.56000, 0.56735, 0.57102, 0.57224, 0.57163, 0.57102,
+          0.56735, 0.56245, 0.55510, 0.54714, 0.53245, 0.52143, 0.50980,
+          0.49878, 0.49020, 0.48347, 0.47735, 0.47490, 0.47490, 0.47673
+        ] ]
       },
-      90: {
-        Dm2_Atm: [
-          [
-            0.0025760, 0.0025833, 0.0025906, 0.0025950, 0.0026008, 0.0026037,
-            0.0026080, 0.0026079, 0.0026035, 0.0025976, 0.0025858, 0.0025712,
-            0.0025521, 0.0025257, 0.0025008, 0.0024700, 0.0024422, 0.0024188,
-            0.0023880, 0.0023748, 0.0023514, 0.0023339, 0.0023222, 0.0023105,
-            0.0023047, 0.0023019, 0.0023078, 0.0023210, 0.0023328, 0.0023489,
-            0.0023636, 0.0023739, 0.0023900, 0.0024032, 0.0024223, 0.0024457,
-            0.0024707, 0.0024941, 0.0025190, 0.0025468, 0.0025629, 0.0025760
-          ]
-        ],
-        S2Th23: [
-          [
-            0.47857, 0.48469, 0.49327, 0.50061, 0.51041, 0.52143, 0.53673,
-            0.55204, 0.56000, 0.56612, 0.57286, 0.57837, 0.58327, 0.58571,
-            0.58694, 0.58694, 0.58449, 0.58204, 0.57653, 0.57347, 0.56612,
-            0.55816, 0.55143, 0.54163, 0.52878, 0.51837, 0.50245, 0.49020,
-            0.48408, 0.47612, 0.47061, 0.46816, 0.46449, 0.46143, 0.45898,
-            0.45776, 0.45714, 0.45714, 0.46020, 0.46510, 0.47122, 0.47857
-          ]
-        ]
+      90 : {
+        Dm2_Atm : [ [
+          0.0025760, 0.0025833, 0.0025906, 0.0025950, 0.0026008, 0.0026037,
+          0.0026080, 0.0026079, 0.0026035, 0.0025976, 0.0025858, 0.0025712,
+          0.0025521, 0.0025257, 0.0025008, 0.0024700, 0.0024422, 0.0024188,
+          0.0023880, 0.0023748, 0.0023514, 0.0023339, 0.0023222, 0.0023105,
+          0.0023047, 0.0023019, 0.0023078, 0.0023210, 0.0023328, 0.0023489,
+          0.0023636, 0.0023739, 0.0023900, 0.0024032, 0.0024223, 0.0024457,
+          0.0024707, 0.0024941, 0.0025190, 0.0025468, 0.0025629, 0.0025760
+        ] ],
+        S2Th23 : [ [
+          0.47857, 0.48469, 0.49327, 0.50061, 0.51041, 0.52143, 0.53673,
+          0.55204, 0.56000, 0.56612, 0.57286, 0.57837, 0.58327, 0.58571,
+          0.58694, 0.58694, 0.58449, 0.58204, 0.57653, 0.57347, 0.56612,
+          0.55816, 0.55143, 0.54163, 0.52878, 0.51837, 0.50245, 0.49020,
+          0.48408, 0.47612, 0.47061, 0.46816, 0.46449, 0.46143, 0.45898,
+          0.45776, 0.45714, 0.45714, 0.46020, 0.46510, 0.47122, 0.47857
+        ] ]
       }
     },
-    S2Th13_dcp: {
-      68: {
-        S2Th13: [
+    S2Th13_dcp : {
+      68 : {
+        S2Th13 : [
           [
             0.026890, 0.028232, 0.029432, 0.030702, 0.032043, 0.033313,
             0.034440, 0.035354
@@ -62,20 +54,20 @@ const OscProbConstraintData = {
             0.033682, 0.034321, 0.035031, 0.035530, 0.035605
           ]
         ],
-        dcp: [
-          [3.1268, 3.0367, 2.9766, 2.9463, 2.9159, 2.9453, 3.0046, 3.1833],
+        dcp : [
+          [ 3.1268, 3.0367, 2.9766, 2.9463, 2.9159, 2.9453, 3.0046, 3.1833 ],
           [
-            -3.1269, -3.0220, -2.9770, -2.8422, -2.7225, -2.5429,
-            -2.3486, -2.1394, -1.8705, -1.5870, -1.3633, -1.1398,
+            -3.1269,  -3.0220,  -2.9770,  -2.8422,  -2.7225,  -2.5429,
+            -2.3486,  -2.1394,  -1.8705,  -1.5870,  -1.3633,  -1.1398,
             -0.97601, -0.84208, -0.72312, -0.64897, -0.60461, -0.60506,
-            -0.68019, -0.82976, -1.0689, -1.2930, -1.5469, -1.7860,
-            -2.0101, -2.2491, -2.5031, -2.7570, -3.0407
+            -0.68019, -0.82976, -1.0689,  -1.2930,  -1.5469,  -1.7860,
+            -2.0101,  -2.2491,  -2.5031,  -2.7570,  -3.0407
           ]
         ]
       },
-      90: {
+      90 : {
 
-        S2Th13: [
+        S2Th13 : [
           [
             0.023120, 0.021777, 0.020857, 0.019867, 0.018733, 0.018237,
             0.017740, 0.017524, 0.017521, 0.017869, 0.018359, 0.018991,
@@ -91,15 +83,15 @@ const OscProbConstraintData = {
             0.037274, 0.038684, 0.039810, 0.040652, 0.040647
           ]
         ],
-        dcp: [
-          [
-            -3.1405, -2.9758, -2.8262, -2.6616, -2.4075, -2.2581,
-            -2.0638, -1.8100, -1.6608, -1.3922, -1.1835, -1.0046,
-            -0.84076, -0.67698, -0.52812, -0.40911, -0.27523, -0.15627,
-            -0.067138, 0.051528, 0.14032, 0.13977, 0.064585, -0.040236,
-            -0.24946, -0.47344, -0.68240, -0.98099, -1.2945, -1.4886,
-            -1.6828, -1.8621, -2.0862, -2.2805, -2.4299, -2.6989,
-            -2.9379, -3.1619
+        dcp : [
+          [
+            -3.1405,   -2.9758,  -2.8262,  -2.6616,  -2.4075,  -2.2581,
+            -2.0638,   -1.8100,  -1.6608,  -1.3922,  -1.1835,  -1.0046,
+            -0.84076,  -0.67698, -0.52812, -0.40911, -0.27523, -0.15627,
+            -0.067138, 0.051528, 0.14032,  0.13977,  0.064585, -0.040236,
+            -0.24946,  -0.47344, -0.68240, -0.98099, -1.2945,  -1.4886,
+            -1.6828,   -1.8621,  -2.0862,  -2.2805,  -2.4299,  -2.6989,
+            -2.9379,   -3.1619
           ],
           [
             3.1282, 3.0683, 2.9783, 2.8585, 2.7686, 2.6487, 2.5737, 2.4837,
@@ -112,30 +104,26 @@ const OscProbConstraintData = {
     }
   },
 
-  NuFIT4: {
-    Expt: "NuFIT",
-    Year: "2018",
-    Ref: "JHEP 01 (2019) 106",
-    S2Th23_Dm2_Atm: {
-      68: {
-        Dm2_Atm: [
-          [
-            0.0025096, 0.0025236, 0.0025376, 0.0025500, 0.0025609,
-            0.0025702, 0.0025734, 0.0025688, 0.0025564, 0.0025440,
-            0.0025238, 0.0025067, 0.0024974, 0.0024881, 0.0024819,
-            0.0024772, 0.0024756, 0.0024787, 0.0024864, 0.0024941
-          ]
-        ],
-        S2Th23: [
-          [
-            0.54561, 0.54939, 0.55479, 0.56235, 0.57152, 0.58178, 0.59096,
-            0.59906, 0.60499, 0.60607, 0.60391, 0.59960, 0.59582, 0.58934,
-            0.58340, 0.57530, 0.56883, 0.55641, 0.55047, 0.54669
-          ]
-        ]
+  NuFIT4 : {
+    Expt : "NuFIT",
+    Year : "2018",
+    Ref : "JHEP 01 (2019) 106",
+    S2Th23_Dm2_Atm : {
+      68 : {
+        Dm2_Atm : [ [
+          0.0025096, 0.0025236, 0.0025376, 0.0025500, 0.0025609,
+          0.0025702, 0.0025734, 0.0025688, 0.0025564, 0.0025440,
+          0.0025238, 0.0025067, 0.0024974, 0.0024881, 0.0024819,
+          0.0024772, 0.0024756, 0.0024787, 0.0024864, 0.0024941
+        ] ],
+        S2Th23 : [ [
+          0.54561, 0.54939, 0.55479, 0.56235, 0.57152, 0.58178, 0.59096,
+          0.59906, 0.60499, 0.60607, 0.60391, 0.59960, 0.59582, 0.58934,
+          0.58340, 0.57530, 0.56883, 0.55641, 0.55047, 0.54669
+        ] ]
       },
-      90: {
-        Dm2_Atm: [
+      90 : {
+        Dm2_Atm : [
           [
             0.0024971, 0.0025080, 0.0025173, 0.0025266, 0.0025360, 0.0025468,
             0.0025577, 0.0025686, 0.0025795, 0.0025888, 0.0025920, 0.0025920,
@@ -149,7 +137,7 @@ const OscProbConstraintData = {
             0.0025202
           ]
         ],
-        S2Th23: [
+        S2Th23 : [
           [
             0.51430, 0.51808, 0.52348, 0.52942, 0.53698, 0.54453,
             0.55155, 0.56181, 0.57099, 0.58124, 0.59042, 0.60175,
@@ -165,28 +153,28 @@ const OscProbConstraintData = {
       }
     },
 
-    S2Th13_dcp: {
-      68: {
-        S2Th13: [
+    S2Th13_dcp : {
+      68 : {
+        S2Th13 : [
           [
             0.022398, 0.022260, 0.022023, 0.021869, 0.021587, 0.021500,
             0.021494, 0.021653, 0.021964, 0.023159, 0.023341, 0.023441,
             0.023433, 0.023342, 0.023208, 0.023007, 0.022793, 0.022644, 0.022398
           ],
-          [0.021978, 0.022224, 0.022526, 0.022870, 0.023091, 0.021978]
+          [ 0.021978, 0.022224, 0.022526, 0.022870, 0.023091, 0.021978 ]
 
         ],
-        dcp: [
+        dcp : [
           [
             -1.1319, -1.1648, -1.3329, -1.5216, -1.9399, -2.2106, -2.5141,
             -2.8668, -3.1252, -3.1252, -2.9570, -2.7069, -2.3993, -2.1286,
             -1.8907, -1.6118, -1.3247, -1.2017, -1.1319
           ],
-          [3.1210, 3.0388, 2.9977, 3.0388, 3.1251, 3.1210]
+          [ 3.1210, 3.0388, 2.9977, 3.0388, 3.1251, 3.1210 ]
         ]
       },
-      90: {
-        S2Th13: [
+      90 : {
+        S2Th13 : [
           [
             0.021428, 0.021159, 0.021055, 0.021061, 0.021176, 0.021264,
             0.021407, 0.021550, 0.021720, 0.022027, 0.022414, 0.022688,
@@ -198,12 +186,12 @@ const OscProbConstraintData = {
             0.023626, 0.023668, 0.021401
           ]
         ],
-        dcp: [
+        dcp : [
           [
-            -3.1375, -2.8176, -2.5223, -2.1450, -1.8743, -1.5626,
-            -1.2099, -0.87357, -0.60288, -0.33219, -0.20915, -0.20915,
-            -0.26657, -0.41422, -0.64389, -1.0130, -1.6610, -2.1368,
-            -2.7602, -3.1375, -3.1375
+            -3.1375,  -2.8176,  -2.5223,  -2.1450,  -1.8743,  -1.5626,
+            -1.2099,  -0.87357, -0.60288, -0.33219, -0.20915, -0.20915,
+            -0.26657, -0.41422, -0.64389, -1.0130,  -1.6610,  -2.1368,
+            -2.7602,  -3.1375,  -3.1375
           ],
           [
             3.1293, 3.0141, 2.7427, 2.6893, 2.7674, 2.8743, 3.0799, 3.1293,
@@ -211,66 +199,58 @@ const OscProbConstraintData = {
           ]
         ]
       }
-    }
+    },
   },
 
-  NOvA2018: {
-    Expt: "NOvA",
-    Year: "2018",
-    Ref: "PRD 98, 032012",
-    S2Th23_Dm2_Atm: {
-      68: {
-        Dm2_Atm: [
-          [
-            0.0025529, 0.0025514, 0.0025446, 0.0025280, 0.0025107, 0.0024979,
-            0.0024948, 0.0025030, 0.0025202, 0.0025375, 0.0025531, 0.0025681,
-            0.0025575, 0.0025222, 0.0024757, 0.0024457, 0.0024202, 0.0023962,
-            0.0023738, 0.0023573, 0.0023506, 0.0023469, 0.0023454, 0.0023425,
-            0.0023472, 0.0023577, 0.0023758, 0.0023953, 0.0024081, 0.0024381,
-            0.0024584, 0.0024854, 0.0025080, 0.0025357, 0.0025529
-          ]
-        ],
-        S2Th23: [
-          [
-            0.43039, 0.44234, 0.45529, 0.47123, 0.48667, 0.50012, 0.51507,
-            0.53400, 0.54421, 0.55965, 0.57584, 0.59029, 0.60324, 0.61071,
-            0.60872, 0.60473, 0.59975, 0.59377, 0.58356, 0.57335, 0.56488,
-            0.55143, 0.53151, 0.50361, 0.47198, 0.45529, 0.44284, 0.43537,
-            0.43039, 0.42391, 0.42192, 0.41968, 0.41968, 0.42316, 0.43039
-          ]
-        ]
+  NOvA2018 : {
+    Expt : "NOvA",
+    Year : "2018",
+    Ref : "PRD 98, 032012",
+    S2Th23_Dm2_Atm : {
+      68 : {
+        Dm2_Atm : [ [
+          0.0025529, 0.0025514, 0.0025446, 0.0025280, 0.0025107, 0.0024979,
+          0.0024948, 0.0025030, 0.0025202, 0.0025375, 0.0025531, 0.0025681,
+          0.0025575, 0.0025222, 0.0024757, 0.0024457, 0.0024202, 0.0023962,
+          0.0023738, 0.0023573, 0.0023506, 0.0023469, 0.0023454, 0.0023425,
+          0.0023472, 0.0023577, 0.0023758, 0.0023953, 0.0024081, 0.0024381,
+          0.0024584, 0.0024854, 0.0025080, 0.0025357, 0.0025529
+        ] ],
+        S2Th23 : [ [
+          0.43039, 0.44234, 0.45529, 0.47123, 0.48667, 0.50012, 0.51507,
+          0.53400, 0.54421, 0.55965, 0.57584, 0.59029, 0.60324, 0.61071,
+          0.60872, 0.60473, 0.59975, 0.59377, 0.58356, 0.57335, 0.56488,
+          0.55143, 0.53151, 0.50361, 0.47198, 0.45529, 0.44284, 0.43537,
+          0.43039, 0.42391, 0.42192, 0.41968, 0.41968, 0.42316, 0.43039
+        ] ]
       },
-      90: {
-        Dm2_Atm: [
-          [
-            0.0026001, 0.0025850, 0.0025685, 0.0025602, 0.0025624, 0.0025706,
-            0.0025840, 0.0025960, 0.0026110, 0.0026244, 0.0026394, 0.0026513,
-            0.0026513, 0.0026400, 0.0026167, 0.0025927, 0.0025582, 0.0025086,
-            0.0024621, 0.0024171, 0.0023706, 0.0023391, 0.0023077, 0.0022807,
-            0.0022695, 0.0022606, 0.0022584, 0.0022592, 0.0022646, 0.0022706,
-            0.0022812, 0.0022932, 0.0023188, 0.0023443, 0.0023759, 0.0024105,
-            0.0024495, 0.0025020, 0.0025486, 0.0025936, 0.0026221, 0.0026296,
-            0.0026340, 0.0026265, 0.0026189, 0.0026001
+      90 : {
+        Dm2_Atm : [ [
+          0.0026001, 0.0025850, 0.0025685, 0.0025602, 0.0025624, 0.0025706,
+          0.0025840, 0.0025960, 0.0026110, 0.0026244, 0.0026394, 0.0026513,
+          0.0026513, 0.0026400, 0.0026167, 0.0025927, 0.0025582, 0.0025086,
+          0.0024621, 0.0024171, 0.0023706, 0.0023391, 0.0023077, 0.0022807,
+          0.0022695, 0.0022606, 0.0022584, 0.0022592, 0.0022646, 0.0022706,
+          0.0022812, 0.0022932, 0.0023188, 0.0023443, 0.0023759, 0.0024105,
+          0.0024495, 0.0025020, 0.0025486, 0.0025936, 0.0026221, 0.0026296,
+          0.0026340, 0.0026265, 0.0026189, 0.0026001
 
-          ]
-        ],
-        S2Th23: [
-          [
-            0.46252, 0.47696, 0.49315, 0.50959, 0.52105, 0.53250, 0.54421,
-            0.55691, 0.56787, 0.57883, 0.59178, 0.60722, 0.61469, 0.62316,
-            0.63213, 0.63661, 0.63910, 0.63885, 0.63587, 0.62864, 0.61968,
-            0.61071, 0.59875, 0.58082, 0.56787, 0.54720, 0.52354, 0.50162,
-            0.48020, 0.46725, 0.45629, 0.44633, 0.43288, 0.42142, 0.41196,
-            0.40399, 0.39801, 0.39402, 0.39402, 0.39801, 0.40498, 0.41494,
-            0.42441, 0.43611, 0.44633, 0.46252
-          ]
-        ]
+        ] ],
+        S2Th23 : [ [
+          0.46252, 0.47696, 0.49315, 0.50959, 0.52105, 0.53250, 0.54421,
+          0.55691, 0.56787, 0.57883, 0.59178, 0.60722, 0.61469, 0.62316,
+          0.63213, 0.63661, 0.63910, 0.63885, 0.63587, 0.62864, 0.61968,
+          0.61071, 0.59875, 0.58082, 0.56787, 0.54720, 0.52354, 0.50162,
+          0.48020, 0.46725, 0.45629, 0.44633, 0.43288, 0.42142, 0.41196,
+          0.40399, 0.39801, 0.39402, 0.39402, 0.39801, 0.40498, 0.41494,
+          0.42441, 0.43611, 0.44633, 0.46252
+        ] ]
       }
     },
 
-    dcp_S2Th23: {
-      68: {
-        S2Th23: [
+    dcp_S2Th23 : {
+      68 : {
+        S2Th23 : [
           [
             0.57654, 0.58064, 0.58967, 0.60112, 0.61007, 0.60583,
             0.59918, 0.60072, 0.60515, 0.60554, 0.44826, 0.43311,
@@ -284,7 +264,7 @@ const OscProbConstraintData = {
           ]
 
         ],
-        dcp: [
+        dcp : [
           [
             1.9419, 2.0048, 2.0956, 2.4378, 3.0735, 4.0863, 4.6801,
             5.5183, 6.1540, 6.2867, 6.2762, 5.8745, 5.4275, 4.7220,
@@ -298,48 +278,152 @@ const OscProbConstraintData = {
           ]
         ]
       },
-      95: {
-        S2Th23: [
+      95 : {
+        S2Th23 : [ [
+          0.63347, 0.63468, 0.63507, 0.63380, 0.63254, 0.63086, 0.62918,
+          0.62996, 0.63075, 0.63356, 0.63556, 0.63673, 0.63543, 0.63332,
+          0.63203, 0.63193, 0.63353, 0.63430, 0.63388, 0.41499, 0.40886,
+          0.40192, 0.39581, 0.39383, 0.39428, 0.39886, 0.40796, 0.42033,
+          0.43599, 0.44999, 0.47057, 0.48126, 0.48621, 0.48704, 0.48460,
+          0.47805, 0.46658, 0.45142, 0.44364, 0.43136, 0.41826, 0.41417,
+          0.63347
+        ] ],
+        dcp : [ [
+          0.0000, 0.1466, 0.3352, 0.6566, 0.8661, 1.1176, 1.4389, 1.7114,
+          1.9838, 2.4797, 2.8989, 3.3669, 3.8768, 4.2959, 4.7150, 5.4764,
+          5.8047, 6.1889, 6.2832, 6.2867, 6.0771, 5.7558, 5.3507, 4.8128,
+          4.4566, 3.9816, 3.5205, 3.1503, 2.7592, 2.4308, 2.1235, 1.9768,
+          1.8441, 1.7533, 1.5856, 1.4389, 1.2154, 0.8941, 0.7194, 0.4749,
+          0.1187, 0.0069, 0.0000
+        ] ]
+      }
+    }
+  },
+
+  KamLand : {
+    Expt : "Kamland",
+    Year : "",
+    Ref : "",
+
+    S2Th12_Dm2_Sol : {
+      68 : {
+        S2Th12 : [
+          [
+            2.995e-1, 3.125e-1, 3.220e-1, 3.303e-1, 3.386e-1, 3.489e-1,
+            3.564e-1, 3.619e-1, 3.611e-1, 3.556e-1, 3.471e-1, 3.346e-1,
+            3.240e-1, 3.127e-1, 2.999e-1, 2.870e-1, 2.813e-1, 2.777e-1,
+            2.770e-1, 2.797e-1, 2.874e-1, 2.995e-1,
+
+          ],
+        ],
+
+        Dm2_Sol : [
           [
-            0.63347, 0.63468, 0.63507, 0.63380, 0.63254, 0.63086, 0.62918,
-            0.62996, 0.63075, 0.63356, 0.63556, 0.63673, 0.63543, 0.63332,
-            0.63203, 0.63193, 0.63353, 0.63430, 0.63388, 0.41499, 0.40886,
-            0.40192, 0.39581, 0.39383, 0.39428, 0.39886, 0.40796, 0.42033,
-            0.43599, 0.44999, 0.47057, 0.48126, 0.48621, 0.48704, 0.48460,
-            0.47805, 0.46658, 0.45142, 0.44364, 0.43136, 0.41826, 0.41417,
-            0.63347
-          ]
+            7.824e-5, 7.835e-5, 7.835e-5, 7.825e-5, 7.784e-5, 7.732e-5,
+            7.669e-5, 7.590e-5, 7.506e-5, 7.427e-5, 7.352e-5, 7.320e-5,
+            7.299e-5, 7.298e-5, 7.318e-5, 7.376e-5, 7.433e-5, 7.496e-5,
+            7.580e-5, 7.675e-5, 7.760e-5, 7.824e-5,
+
+          ],
+        ]
+      },
+
+      90 : {
+        S2Th12 : [
+          [
+            3.193e-1, 3.315e-1, 3.481e-1, 3.627e-1, 3.770e-1,
+            3.912e-1, 3.971e-1, 3.939e-1, 3.872e-1, 3.663e-1,
+            3.520e-1, 3.319e-1, 3.137e-1, 2.959e-1, 2.769e-1,
+            2.659e-1, 2.556e-1, 2.544e-1, 2.556e-1, 2.596e-1,
+            2.671e-1, 2.770e-1, 2.888e-1, 3.031e-1, 3.193e-1,
+
+          ],
         ],
-        dcp: [
+
+        Dm2_Sol : [
           [
-            0.0000, 0.1466, 0.3352, 0.6566, 0.8661, 1.1176, 1.4389, 1.7114,
-            1.9838, 2.4797, 2.8989, 3.3669, 3.8768, 4.2959, 4.7150, 5.4764,
-            5.8047, 6.1889, 6.2832, 6.2867, 6.0771, 5.7558, 5.3507, 4.8128,
-            4.4566, 3.9816, 3.5205, 3.1503, 2.7592, 2.4308, 2.1235, 1.9768,
-            1.8441, 1.7533, 1.5856, 1.4389, 1.2154, 0.8941, 0.7194, 0.4749,
-            0.1187, 0.0069, 0.0000
-          ]
+            8.067e-5, 8.052e-5, 8.010e-5, 7.959e-5, 7.880e-5,
+            7.750e-5, 7.608e-5, 7.492e-5, 7.418e-5, 7.280e-5,
+            7.232e-5, 7.189e-5, 7.161e-5, 7.176e-5, 7.244e-5,
+            7.327e-5, 7.479e-5, 7.579e-5, 7.695e-5, 7.779e-5,
+            7.885e-5, 7.959e-5, 8.028e-5, 8.061e-5, 8.067e-5,
+
+          ],
         ]
-      }
+      },
     }
   },
 
-  DayaBay2016: {
-    Expt: "Daya Bay",
-    Year: "2016",
-    Ref: "PRD 93, 072011",
+  SolarGlobal : {
+    Expt : "Solar Global",
+    Year : "",
+    Ref : "",
+
+    S2Th12_Dm2_Sol : {
+      68 : {
+        S2Th12 : [
+          [
+            2.923e-1, 2.945e-1, 2.990e-1, 3.058e-1, 3.113e-1, 3.152e-1,
+            3.196e-1, 3.239e-1, 3.255e-1, 3.266e-1, 3.278e-1, 3.266e-1,
+            3.236e-1, 3.199e-1, 3.151e-1, 3.082e-1, 3.013e-1, 2.958e-1,
+            2.916e-1, 2.883e-1, 2.877e-1, 2.885e-1, 2.895e-1, 2.901e-1,
+            2.905e-1, 2.923e-1,
 
-    S2Th13_dcp: {
-      one_sigma: {
-        S2Th13: [
+          ],
+        ],
+
+        Dm2_Sol : [
           [
-            0.0219832638913, 0.0198958446337, 0.0198958446337, 0.0219832638913,
-            0.0219832638913
-          ]
+            6.392e-5, 6.539e-5, 6.739e-5, 6.824e-5, 6.782e-5, 6.656e-5,
+            6.498e-5, 6.130e-5, 5.741e-5, 5.257e-5, 4.888e-5, 4.667e-5,
+            4.488e-5, 4.351e-5, 4.246e-5, 4.182e-5, 4.240e-5, 4.360e-5,
+            4.550e-5, 4.718e-5, 4.855e-5, 5.086e-5, 5.339e-5, 5.718e-5,
+            6.113e-5, 6.392e-5,
+
+          ],
+        ]
+      },
+
+      90 : {
+        S2Th12 : [
+          [
+            3.027e-1, 3.118e-1, 3.175e-1, 3.218e-1, 3.260e-1, 3.287e-1,
+            3.330e-1, 3.358e-1, 3.374e-1, 3.385e-1, 3.389e-1, 3.399e-1,
+            3.403e-1, 3.397e-1, 3.365e-1, 3.305e-1, 3.238e-1, 3.147e-1,
+            3.064e-1, 2.949e-1, 2.886e-1, 2.843e-1, 2.811e-1, 2.772e-1,
+            2.750e-1, 2.757e-1, 2.753e-1, 2.761e-1, 2.777e-1, 2.805e-1,
+            2.856e-1, 2.928e-1, 3.027e-1,
+
+          ],
         ],
-        dcp: [
-          [-Math.PI, -Math.PI, Math.PI, Math.PI, -Math.PI]
+
+        Dm2_Sol : [
+          [
+            8.040e-5, 7.924e-5, 7.751e-5, 7.551e-5, 7.299e-5, 7.099e-5,
+            6.794e-5, 6.541e-5, 6.289e-5, 5.973e-5, 5.668e-5, 5.342e-5,
+            4.973e-5, 4.678e-5, 4.320e-5, 3.878e-5, 3.583e-5, 3.446e-5,
+            3.403e-5, 3.492e-5, 3.634e-5, 3.886e-5, 4.181e-5, 4.528e-5,
+            4.854e-5, 5.233e-5, 5.686e-5, 6.222e-5, 6.570e-5, 6.960e-5,
+            7.433e-5, 7.834e-5, 8.040e-5,
+
+          ],
         ]
+      },
+    }
+  },
+
+  DayaBay2016 : {
+    Expt : "Daya Bay",
+    Year : "2016",
+    Ref : "PRD 93, 072011",
+
+    S2Th13_dcp : {
+      one_sigma : {
+        S2Th13 : [ [
+          0.0219832638913, 0.0198958446337, 0.0198958446337, 0.0219832638913,
+          0.0219832638913
+        ] ],
+        dcp : [ [ -Math.PI, -Math.PI, Math.PI, Math.PI, -Math.PI ] ]
       }
     }
 
diff --git a/osc.html b/osc.html
index 9507a77..a893a32 100644
--- a/osc.html
+++ b/osc.html
@@ -87,6 +87,14 @@
       stroke: blue;
     }
 
+    .KamLandConstraint {
+      stroke: purple;
+    }
+
+    .KamLandConstraint {
+      stroke: magenta;
+    }
+
     .DBConstraint {
       stroke: orange;
     }
diff --git a/tools/OscConstraintWidget.js b/tools/OscConstraintWidget.js
index acdc454..3486fb4 100644
--- a/tools/OscConstraintWidget.js
+++ b/tools/OscConstraintWidget.js
@@ -14,7 +14,7 @@ class OPContour {
     for (let sit = 0; sit < this.x.length; sit++) {
       data[sit] = [];
       for (let dit = 0; dit < this.x[sit].length; dit++) {
-        data[sit].push([this.x[sit][dit], this.y[sit][dit]]);
+        data[sit].push([ this.x[sit][dit], this.y[sit][dit] ]);
       }
     }
     return data;
@@ -22,12 +22,10 @@ class OPContour {
 };
 
 class OscProbConstraints {
-  constructor() {
-    this.Constraints = {};
-  }
+  constructor() { this.Constraints = {}; }
 
   AddConstraint(namef, xaxf, yaxf, xpointsf, ypointsf,
-    lineclass = "constraint_line", tool_tip_html = undefined) {
+                lineclass = "constraint_line", tool_tip_html = undefined) {
     if (!OscProbConstraints.IsValidAxis(xaxf)) {
       console.log(`Failed to add constraint with invalid axis name: ${xaxf}`);
       return;
@@ -43,16 +41,20 @@ class OscProbConstraints {
       this.Constraints[xaxf][yaxf] = [];
     }
     this.Constraints[xaxf][yaxf].push(
-      new OPContour(namef, xpointsf, ypointsf, lineclass, tool_tip_html));
+        new OPContour(namef, xpointsf, ypointsf, lineclass, tool_tip_html));
   }
 
   static IsValidAxis(axname) {
     if (axname === "Dm2_Atm") {
       return true;
+    } else if (axname === "Dm2_Sol") {
+      return true;
     } else if (axname === "S2Th23") {
       return true;
     } else if (axname === "S2Th13") {
       return true;
+    }else if (axname === "S2Th12") {
+      return true;
     } else if (axname === "dcp") {
       return true;
     }
@@ -64,20 +66,20 @@ class OscProbConstraints {
     Object.keys(this.Constraints).forEach(function(key_x) {
       Object.keys(this.Constraints[key_x]).forEach(function(key_y) {
         let constraints = this.Constraints[key_x][key_y];
-        let plotn = [key_x + "_" + key_y].join("");
+        let plotn = [ key_x + "_" + key_y ].join("");
         if (!(plotn in data)) {
           data[plotn] = [];
         }
 
         for (let cit = 0; cit < constraints.length; ++cit) {
           data[plotn].push({
-            meta: {
-              id: cit,
-              name: constraints[cit].name,
-              tool_tip_html: constraints[cit].tool_tip_html,
-              lineclass: constraints[cit].lineclass
+            meta : {
+              id : cit,
+              name : constraints[cit].name,
+              tool_tip_html : constraints[cit].tool_tip_html,
+              lineclass : constraints[cit].lineclass
             },
-            data: constraints[cit].GetPointList()
+            data : constraints[cit].GetPointList()
           });
         }
       }, this);
@@ -96,7 +98,8 @@ class PlotPoint {
 };
 
 class ConstraintAxes {
-  constructor(namef, titlef, minf, maxf, tickArgsf = [5], exp_scalef = 1, param_namef=undefined) {
+  constructor(namef, titlef, minf, maxf, tickArgsf = [ 5 ], exp_scalef = 1,
+              param_namef = undefined) {
     this.name = namef;
     this.title = titlef;
     this.min = minf * exp_scalef;
@@ -104,7 +107,7 @@ class ConstraintAxes {
     this.tickArgs = tickArgsf;
     this.exp_scale = exp_scalef;
     this.param_name = param_namef;
-    if(this.param_name === undefined){
+    if (this.param_name === undefined) {
       this.param_name = this.name;
     }
   }
@@ -135,80 +138,68 @@ class ConstraintWidget {
     let x = oscParams.Get(this.xAxis.param_name);
     let y = oscParams.Get(this.yAxis.param_name);
 
-    this.last_OscParamPoint = this.svg.append("circle")
-      .attr("class", `cpoint ${point_class}`)
-      .attr("pointer-events", "none")
-      .attr("cx", this.xScale(x * this.xAxis.exp_scale))
-      .attr("cy", this.yScale(y * this.yAxis.exp_scale))
-      .attr("r", 3);
+    this.last_OscParamPoint =
+        this.svg.append("circle")
+            .attr("class", `cpoint ${point_class}`)
+            .attr("pointer-events", "none")
+            .attr("cx", this.xScale(x * this.xAxis.exp_scale))
+            .attr("cy", this.yScale(y * this.yAxis.exp_scale))
+            .attr("r", 3);
   }
 
-  SetOscParams() {
-    this.last_OscParamPoint = undefined;
-  }
+  SetOscParams() { this.last_OscParamPoint = undefined; }
 
-  ClearOscParams() {
-    this.svg.selectAll(".cpoint").remove();
-  }
+  ClearOscParams() { this.svg.selectAll(".cpoint").remove(); }
 
   Initialize(ele, onchanged_callback, on_hover_callback, off_hover_callback) {
 
     let width = 200;
     let height = 150;
-    let margin = {
-      top: 20,
-      right: 20,
-      bottom: 75,
-      left: 90
-    };
+    let margin = {top : 20, right : 20, bottom : 75, left : 90};
     let tot_width = width + margin.left + margin.right;
     let tot_height = height + margin.top + margin.bottom;
 
     this.xScale = d3.scaleLinear()
-      .domain([this.xAxis.min, this.xAxis.max]) // input
-      .range([0, width]); // output
+                      .domain([ this.xAxis.min, this.xAxis.max ]) // input
+                      .range([ 0, width ]);                       // output
     let xScale = this.xScale;
     let xAxis = this.xAxis;
     this.yScale = d3.scaleLinear()
-      .domain([this.yAxis.min, this.yAxis.max]) // input
-      .range([height, 0]); // output
+                      .domain([ this.yAxis.min, this.yAxis.max ]) // input
+                      .range([ height, 0 ]);                      // output
     let yScale = this.yScale;
     let yAxis = this.yAxis;
     this.lineGen =
-      d3.line()
-      .x(function(d) {
-        return xScale(d[0] * xAxis.exp_scale);
-      })
-      .y(function(d) {
-        return yScale(d[1] * yAxis.exp_scale);
-      });
+        d3.line()
+            .x(function(d) { return xScale(d[0] * xAxis.exp_scale); })
+            .y(function(d) { return yScale(d[1] * yAxis.exp_scale); });
     // .curve(d3.curveNatural);
 
     this.svg = d3.select(ele)
-      .append("svg")
-      .attr("width", tot_width)
-      .attr("height", tot_height)
-      .append("g")
-      .attr("transform",
-        "translate(" + margin.left + "," + margin.top + ")");
+                   .append("svg")
+                   .attr("width", tot_width)
+                   .attr("height", tot_height)
+                   .append("g")
+                   .attr("transform",
+                         "translate(" + margin.left + "," + margin.top + ")");
     // x axis object
     this.svg.append("g")
-      .attr("class", "x_axis")
-      .attr("transform", "translate(0," + height + ")")
-      .call(d3.axisBottom(this.xScale).tickArguments(this.xAxis.tickArgs));
+        .attr("class", "x_axis")
+        .attr("transform", "translate(0," + height + ")")
+        .call(d3.axisBottom(this.xScale).tickArguments(this.xAxis.tickArgs));
 
     // x axis title
     RenderLatexLabel(this.svg.append("text").text(this.xAxis.title), this.svg,
-      "25ex", "10ex", width * 0.6, height * 1.2, 1, 1);
+                     "25ex", "10ex", width * 0.6, height * 1.2, 1, 1);
 
     // y axis object
     this.svg.append("g")
-      .attr("class", "y_axis")
-      .call(d3.axisLeft(this.yScale).tickArguments(this.yAxis.tickArgs));
+        .attr("class", "y_axis")
+        .call(d3.axisLeft(this.yScale).tickArguments(this.yAxis.tickArgs));
 
     // y axis title
     RenderLatexLabel(this.svg.append("text").text(this.yAxis.title), this.svg,
-      "25ex", "10ex", -120, -80, 1, 1, -90);
+                     "25ex", "10ex", -120, -80, 1, 1, -90);
 
     let xAxis_name = this.xAxis.param_name;
     let yAxis_name = this.yAxis.param_name;
@@ -238,11 +229,11 @@ class ConstraintWidget {
     let plot = this;
     this.no_set_point = false;
 
-    MathJax.Hub.Queue([function() {
+    MathJax.Hub.Queue([ function() {
       let rect = plot.svg.append("rect")
-        .attr("class", "overlay")
-        .attr("width", width)
-        .attr("height", height);
+                     .attr("class", "overlay")
+                     .attr("width", width)
+                     .attr("height", height);
 
       function mouseDownHandler() {
         plot.no_set_point = true;
@@ -259,35 +250,35 @@ class ConstraintWidget {
       rect.on("mousedown", mouseDownHandler).on("mouseup", mouseUpHandler);
 
       let tooltip = d3.select("body")
-        .append("div")
-        .attr("class", "tooltip")
-        .style("opacity", 0);
+                        .append("div")
+                        .attr("class", "tooltip")
+                        .style("opacity", 0);
 
       for (let ci = 0; ci < plot.ConstraintData.length; ++ci) {
         for (let pi = 0; pi < plot.ConstraintData[ci].data.length; ++pi) {
           let tool_tip_html = plot.ConstraintData[ci].meta.tool_tip_html;
           let path =
-            plot.svg.append("path")
-            .attr("d",
-              plot.lineGen(
-                plot.ConstraintData[ci].data[pi])) // 11. Calls the
-            // line generator
-            .attr("class", plot.ConstraintData[ci].meta.lineclass)
-            .on("mousedown", mouseDownHandler)
-            .on("mouseup", mouseUpHandler);
+              plot.svg.append("path")
+                  .attr("d",
+                        plot.lineGen(
+                            plot.ConstraintData[ci].data[pi])) // 11. Calls the
+                  // line generator
+                  .attr("class", plot.ConstraintData[ci].meta.lineclass)
+                  .on("mousedown", mouseDownHandler)
+                  .on("mouseup", mouseUpHandler);
           if (tool_tip_html != undefined) {
             path.on("mouseover", function() {
-              tooltip.transition().duration(200).style("opacity", .9);
-              tooltip.style("left", (d3.event.pageX) + "px")
-                .style("top", (d3.event.pageY - 28) + "px")
-                .html(tool_tip_html);
-            }).on("mouseout", function() {
+                  tooltip.transition().duration(200).style("opacity", .9);
+                  tooltip.style("left", (d3.event.pageX) + "px")
+                      .style("top", (d3.event.pageY - 28) + "px")
+                      .html(tool_tip_html);
+                }).on("mouseout", function() {
               tooltip.transition().duration(500).style("opacity", 0);
             });
           }
         }
       }
-    }]);
+    } ]);
   };
 
   // Callback for setting new values
@@ -296,79 +287,150 @@ class ConstraintWidget {
 function GetConstraintData() {
   let ConstraintData = new OscProbConstraints();
   ConstraintData.AddConstraint(
-    "T2K2018_68", "S2Th23", "Dm2_Atm", OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[68].S2Th23,
-    OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[68].Dm2_Atm,
-    "constraint_line constraint_inner T2KConstraint",
-    `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${OscProbConstraintData.T2K2018.Ref}</div>`);
+      "T2K2018_68", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[68].S2Th23,
+      OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[68].Dm2_Atm,
+      "constraint_line constraint_inner T2KConstraint",
+      `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.T2K2018.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "T2K2018_90", "S2Th23", "Dm2_Atm", OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[90].S2Th23,
-    OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[90].Dm2_Atm,
-    "constraint_line constraint_outer T2KConstraint",
-    `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${OscProbConstraintData.T2K2018.Ref}</div>`);
+      "T2K2018_90", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[90].S2Th23,
+      OscProbConstraintData.T2K2018.S2Th23_Dm2_Atm[90].Dm2_Atm,
+      "constraint_line constraint_outer T2KConstraint",
+      `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.T2K2018.Ref}</div>`);
 
   ConstraintData.AddConstraint(
-    "T2K2018_68", "S2Th13", "dcp", OscProbConstraintData.T2K2018.S2Th13_dcp[68].S2Th13,
-    OscProbConstraintData.T2K2018.S2Th13_dcp[68].dcp,
-    "constraint_line constraint_inner T2KConstraint",
-    `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${OscProbConstraintData.T2K2018.Ref}</div>`);
+      "T2K2018_68", "S2Th13", "dcp",
+      OscProbConstraintData.T2K2018.S2Th13_dcp[68].S2Th13,
+      OscProbConstraintData.T2K2018.S2Th13_dcp[68].dcp,
+      "constraint_line constraint_inner T2KConstraint",
+      `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.T2K2018.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "T2K2018_90", "S2Th13", "dcp", OscProbConstraintData.T2K2018.S2Th13_dcp[90].S2Th13,
-    OscProbConstraintData.T2K2018.S2Th13_dcp[90].dcp,
-    "constraint_line constraint_outer T2KConstraint",
-    `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${OscProbConstraintData.T2K2018.Ref}</div>`);
+      "T2K2018_90", "S2Th13", "dcp",
+      OscProbConstraintData.T2K2018.S2Th13_dcp[90].S2Th13,
+      OscProbConstraintData.T2K2018.S2Th13_dcp[90].dcp,
+      "constraint_line constraint_outer T2KConstraint",
+      `<div>Expt: ${OscProbConstraintData.T2K2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.T2K2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.T2K2018.Ref}</div>`);
 
   ConstraintData.AddConstraint(
-    "NOvA2018_68", "S2Th23", "Dm2_Atm", OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[68].S2Th23,
-    OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[68].Dm2_Atm,
-    "constraint_line constraint_inner NOvAConstraint",
-    `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${OscProbConstraintData.NOvA2018.Ref}</div>`);
+      "NOvA2018_68", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[68].S2Th23,
+      OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[68].Dm2_Atm,
+      "constraint_line constraint_inner NOvAConstraint",
+      `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.NOvA2018.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "NOvA2018_90", "S2Th23", "Dm2_Atm", OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[90].S2Th23,
-    OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[90].Dm2_Atm,
-    "constraint_line constraint_outer NOvAConstraint",
-    `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${OscProbConstraintData.NOvA2018.Ref}</div>`);
+      "NOvA2018_90", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[90].S2Th23,
+      OscProbConstraintData.NOvA2018.S2Th23_Dm2_Atm[90].Dm2_Atm,
+      "constraint_line constraint_outer NOvAConstraint",
+      `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.NOvA2018.Ref}</div>`);
 
   ConstraintData.AddConstraint(
-    "NOvA2018_68", "dcp", "S2Th23",
-    OscProbConstraintData.NOvA2018.dcp_S2Th23[68].dcp,
-    OscProbConstraintData.NOvA2018.dcp_S2Th23[68].S2Th23,
-    "constraint_line constraint_inner NOvAConstraint",
-    `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${OscProbConstraintData.NOvA2018.Ref}</div>`);
+      "NOvA2018_68", "dcp", "S2Th23",
+      OscProbConstraintData.NOvA2018.dcp_S2Th23[68].dcp,
+      OscProbConstraintData.NOvA2018.dcp_S2Th23[68].S2Th23,
+      "constraint_line constraint_inner NOvAConstraint",
+      `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.NOvA2018.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "NOvA2018_95", "dcp", "S2Th23",
-    OscProbConstraintData.NOvA2018.dcp_S2Th23[95].dcp,
-  OscProbConstraintData.NOvA2018.dcp_S2Th23[95].S2Th23,
-    "constraint_line constraint_outer NOvAConstraint",
-    `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${OscProbConstraintData.NOvA2018.Ref}</div>`);
+      "NOvA2018_95", "dcp", "S2Th23",
+      OscProbConstraintData.NOvA2018.dcp_S2Th23[95].dcp,
+      OscProbConstraintData.NOvA2018.dcp_S2Th23[95].S2Th23,
+      "constraint_line constraint_outer NOvAConstraint",
+      `<div>Expt: ${OscProbConstraintData.NOvA2018.Expt}</div><div>Year: ${
+          OscProbConstraintData.NOvA2018.Year}</div><div>Ref: ${
+          OscProbConstraintData.NOvA2018.Ref}</div>`);
 
+  ConstraintData.AddConstraint(
+      "NuFIT4_68", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[68].S2Th23,
+      OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[68].Dm2_Atm,
+      "constraint_line constraint_inner NuFIT4Constraint",
+      `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${
+          OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${
+          OscProbConstraintData.NuFIT4.Ref}</div>`);
+  ConstraintData.AddConstraint(
+      "NuFIT4_90", "S2Th23", "Dm2_Atm",
+      OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[90].S2Th23,
+      OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[90].Dm2_Atm,
+      "constraint_line constraint_outer NuFIT4Constraint",
+      `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${
+          OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${
+          OscProbConstraintData.NuFIT4.Ref}</div>`);
 
   ConstraintData.AddConstraint(
-    "NuFIT4_68", "S2Th23", "Dm2_Atm", OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[68].S2Th23,
-    OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[68].Dm2_Atm,
-    "constraint_line constraint_inner NuFIT4Constraint",
-    `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${OscProbConstraintData.NuFIT4.Ref}</div>`);
+      "NuFIT4_68", "S2Th13", "dcp",
+      OscProbConstraintData.NuFIT4.S2Th13_dcp[68].S2Th13,
+      OscProbConstraintData.NuFIT4.S2Th13_dcp[68].dcp,
+      "constraint_line constraint_inner NuFIT4Constraint",
+      `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${
+          OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${
+          OscProbConstraintData.NuFIT4.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "NuFIT4_90", "S2Th23", "Dm2_Atm", OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[90].S2Th23,
-    OscProbConstraintData.NuFIT4.S2Th23_Dm2_Atm[90].Dm2_Atm,
-    "constraint_line constraint_outer NuFIT4Constraint",
-    `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${OscProbConstraintData.NuFIT4.Ref}</div>`);
+      "NuFIT4_90", "S2Th13", "dcp",
+      OscProbConstraintData.NuFIT4.S2Th13_dcp[90].S2Th13,
+      OscProbConstraintData.NuFIT4.S2Th13_dcp[90].dcp,
+      "constraint_line constraint_outer NuFIT4Constraint",
+      `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${
+          OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${
+          OscProbConstraintData.NuFIT4.Ref}</div>`);
 
   ConstraintData.AddConstraint(
-    "NuFIT4_68", "S2Th13", "dcp", OscProbConstraintData.NuFIT4.S2Th13_dcp[68].S2Th13,
-    OscProbConstraintData.NuFIT4.S2Th13_dcp[68].dcp,
-    "constraint_line constraint_inner NuFIT4Constraint",
-    `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${OscProbConstraintData.NuFIT4.Ref}</div>`);
+      "KamLand_68", "S2Th12", "Dm2_Sol",
+      OscProbConstraintData.KamLand.S2Th12_Dm2_Sol[68].S2Th12,
+      OscProbConstraintData.KamLand.S2Th12_Dm2_Sol[68].Dm2_Sol,
+      "constraint_line constraint_inner KamLandConstraint",
+      `<div>Expt: ${OscProbConstraintData.KamLand.Expt}</div><div>Year: ${
+          OscProbConstraintData.KamLand.Year}</div><div>Ref: ${
+          OscProbConstraintData.KamLand.Ref}</div>`);
   ConstraintData.AddConstraint(
-    "NuFIT4_90", "S2Th13", "dcp", OscProbConstraintData.NuFIT4.S2Th13_dcp[90].S2Th13,
-    OscProbConstraintData.NuFIT4.S2Th13_dcp[90].dcp,
-    "constraint_line constraint_outer NuFIT4Constraint",
-    `<div>Expt: ${OscProbConstraintData.NuFIT4.Expt}</div><div>Year: ${OscProbConstraintData.NuFIT4.Year}</div><div>Ref: ${OscProbConstraintData.NuFIT4.Ref}</div>`);
+      "KamLand_90", "S2Th12", "Dm2_Sol",
+      OscProbConstraintData.KamLand.S2Th12_Dm2_Sol[90].S2Th12,
+      OscProbConstraintData.KamLand.S2Th12_Dm2_Sol[90].Dm2_Sol,
+      "constraint_line constraint_outer KamLandConstraint",
+      `<div>Expt: ${OscProbConstraintData.KamLand.Expt}</div><div>Year: ${
+          OscProbConstraintData.KamLand.Year}</div><div>Ref: ${
+          OscProbConstraintData.KamLand.Ref}</div>`);
+
+  ConstraintData.AddConstraint(
+      "SolarGlobal_68", "S2Th12", "Dm2_Sol",
+      OscProbConstraintData.SolarGlobal.S2Th12_Dm2_Sol[68].S2Th12,
+      OscProbConstraintData.SolarGlobal.S2Th12_Dm2_Sol[68].Dm2_Sol,
+      "constraint_line constraint_inner SolarGlobalConstraint",
+      `<div>Expt: ${OscProbConstraintData.SolarGlobal.Expt}</div><div>Year: ${
+          OscProbConstraintData.SolarGlobal.Year}</div><div>Ref: ${
+          OscProbConstraintData.SolarGlobal.Ref}</div>`);
+  ConstraintData.AddConstraint(
+      "SolarGlobal_90", "S2Th12", "Dm2_Sol",
+      OscProbConstraintData.SolarGlobal.S2Th12_Dm2_Sol[90].S2Th12,
+      OscProbConstraintData.SolarGlobal.S2Th12_Dm2_Sol[90].Dm2_Sol,
+      "constraint_line constraint_outer SolarGlobalConstraint",
+      `<div>Expt: ${OscProbConstraintData.SolarGlobal.Expt}</div><div>Year: ${
+          OscProbConstraintData.SolarGlobal.Year}</div><div>Ref: ${
+          OscProbConstraintData.SolarGlobal.Ref}</div>`);
 
 
   ConstraintData.AddConstraint(
-    "DB2018_68", "S2Th13", "dcp", OscProbConstraintData.DayaBay2016.S2Th13_dcp["one_sigma"].S2Th13, OscProbConstraintData.DayaBay2016.S2Th13_dcp["one_sigma"].dcp,
-    "constraint_line constraint_inner DBConstraint",
-    `<div>Expt: ${OscProbConstraintData.DayaBay2016.Expt}</div><div>Year: ${OscProbConstraintData.DayaBay2016.Year}</div><div>Ref: ${OscProbConstraintData.DayaBay2016.Ref}</div>`);
+      "DB2018_68", "S2Th13", "dcp",
+      OscProbConstraintData.DayaBay2016.S2Th13_dcp["one_sigma"].S2Th13,
+      OscProbConstraintData.DayaBay2016.S2Th13_dcp["one_sigma"].dcp,
+      "constraint_line constraint_inner DBConstraint",
+      `<div>Expt: ${OscProbConstraintData.DayaBay2016.Expt}</div><div>Year: ${
+          OscProbConstraintData.DayaBay2016.Year}</div><div>Ref: ${
+          OscProbConstraintData.DayaBay2016.Ref}</div>`);
 
   return ConstraintData.GetConstraintData();
 }
@@ -376,36 +438,43 @@ function GetConstraintData() {
 var constraint_plots = [];
 
 function InitializeConstraintWidgets(el, onchanged_callback, on_hover_callback,
-  off_hover_callback) {
+                                     off_hover_callback) {
 
   let constraint_data = GetConstraintData();
 
   let ax_Dm2_Atm = new ConstraintAxes(
-    "Dm2_Atm", "\\(\\Delta{}\\textrm{m}_{32}^{2} 10^{-3} eV\\)", 2.2E-3,
-    2.7E-3, [3], 1E3);
+      "Dm2_Atm", "\\(\\Delta{}\\textrm{m}_{32}^{2} 10^{-3} eV\\)", 2.2E-3,
+      2.7E-3, [ 3 ], 1E3);
 
   let ax_S2Th23 = new ConstraintAxes("S2Th23", GetParamLatexName("S2Th23"),
-    0.375, 0.625, [2]);
+                                     0.375, 0.625, [ 2 ]);
 
   let ax_dcp_mpi_pi =
-    new ConstraintAxes("dcp", "\\(\\delta_{\\rm {\\small cp}} /\\pi\\)",
-      -Math.PI, Math.PI, [2], 1.0 / Math.PI, "dcp_mpi_pi");
+      new ConstraintAxes("dcp", "\\(\\delta_{\\rm {\\small cp}} /\\pi\\)",
+                         -Math.PI, Math.PI, [ 2 ], 1.0 / Math.PI, "dcp_mpi_pi");
 
   let ax_dcp_0_2pi =
-    new ConstraintAxes("dcp", "\\(\\delta_{\\rm {\\small cp}} /\\pi\\)",
-      0, 2*Math.PI, [2], 1.0 / Math.PI, "dcp_0_2pi");
-
+      new ConstraintAxes("dcp", "\\(\\delta_{\\rm {\\small cp}} /\\pi\\)", 0,
+                         2 * Math.PI, [ 2 ], 1.0 / Math.PI, "dcp_0_2pi");
 
   let ax_S2Th13 = new ConstraintAxes("S2Th13", GetParamLatexName("S2Th13"),
-    10E-3, 50E-3, [2]);
+                                     10E-3, 50E-3, [ 2 ]);
 
-  constraint_plots.push(new ConstraintWidget(constraint_data["S2Th23_Dm2_Atm"],
-    ax_S2Th23, ax_Dm2_Atm));
-  constraint_plots.push(
-    new ConstraintWidget(constraint_data["S2Th13_dcp"], ax_S2Th13, ax_dcp_mpi_pi));
+  let ax_Dm2_Sol = new ConstraintAxes(
+      "Dm2_Sol", "\\(\\Delta{}\\textrm{m}_{21}^{2} 10^{-5} eV\\)", 2E-5, 10E-5,
+      [ 3 ], 1E5);
+
+  let ax_S2Th12 = new ConstraintAxes("S2Th12", GetParamLatexName("S2Th12"), 0.2,
+                                     0.4, [ 2 ]);
 
-  constraint_plots.push(
-    new ConstraintWidget(constraint_data["dcp_S2Th23"], ax_dcp_0_2pi, ax_S2Th23));
+  constraint_plots.push(new ConstraintWidget(constraint_data["S2Th23_Dm2_Atm"],
+                                             ax_S2Th23, ax_Dm2_Atm));
+  constraint_plots.push(new ConstraintWidget(constraint_data["S2Th13_dcp"],
+                                             ax_S2Th13, ax_dcp_mpi_pi));
+  constraint_plots.push(new ConstraintWidget(constraint_data["dcp_S2Th23"],
+                                             ax_dcp_0_2pi, ax_S2Th23));
+  constraint_plots.push(new ConstraintWidget(constraint_data["S2Th12_Dm2_Sol"],
+                                             ax_S2Th12, ax_Dm2_Sol));
 
   for (let plot_i = 0; plot_i < constraint_plots.length; ++plot_i) {
     constraint_plots[plot_i].Initialize(el, function(pp) {
diff --git a/tools/OscUtils.js b/tools/OscUtils.js
index 8a8575c..ae8e7ba 100644
--- a/tools/OscUtils.js
+++ b/tools/OscUtils.js
@@ -82,10 +82,14 @@ class OscParams {
   Set(name, value) {
     if (name === "Dm2_Atm") {
       this.Dm2_Atm = value;
+    } else if (name === "Dm2_Sol") {
+      this.Dm2_21 = value;
     } else if (name === "S2Th23") {
       this.S2Th23 = value;
     } else if (name === "S2Th13") {
       this.S2Th13 = value;
+    } else if (name === "S2Th12") {
+      this.S2Th12 = value;
     } else if (name === "dcp") {
       this.dcp = myfmod(value, 2 * Math.PI);
       if (this.dcp < -Math.PI) {
@@ -107,10 +111,14 @@ class OscParams {
   Get(name) {
     if (name === "Dm2_Atm") {
       return this.Dm2_Atm;
+    } else if (name === "Dm2_Sol") {
+      return this.Dm2_21;
     } else if (name === "S2Th23") {
       return this.S2Th23;
     } else if (name === "S2Th13") {
       return this.S2Th13;
+    } else if (name === "S2Th12") {
+      return this.S2Th12;
     } else if (name === "dcp") {
       return this.dcp;
     } else if (name === "dcp_mpi_pi") {
@@ -155,6 +163,8 @@ function GetParamLatexName(name) {
     return '\\(\\Delta{}\\textrm{m}_{32}^{2}\\)';
   } else if (name === "Dm2_21") {
     return '\\(\\Delta{}\\textrm{m}_{21}^{2}\\)';
+  } else if (name === "Dm2_Sol") {
+    return GetParamLatexName("Dm2_21");
   } else if (name === "S2Th12") {
     return '\\(\\sin^{2}(\\theta_{12})\\)';
   } else if (name === "S2Th13") {