diff --git a/600A/AN_600A_FPA.ipynb b/600A/AN_600A_FPA.ipynb
index ba1e326870db85a651610dcf3cd88bc1f0521085..4970e00206f03ca5671da1dcd029748cf85f485a 100644
--- a/600A/AN_600A_FPA.ipynb
+++ b/600A/AN_600A_FPA.ipynb
@@ -328,7 +328,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df, i_a_df, i_ref_df])"
    ]
diff --git a/600A/AN_600A_PNO.d3.ipynb b/600A/AN_600A_PNO.d3.ipynb
index cf761a98639981efea5e7f3d17f43e97576efe4a..ae4f22c8188c634b6fb64124042e63b94142af8d 100644
--- a/600A/AN_600A_PNO.d3.ipynb
+++ b/600A/AN_600A_PNO.d3.ipynb
@@ -336,7 +336,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "plt.rcParams[\"figure.figsize\"] = [12, 7]\n",
     "plt.rcParams[\"figure.autolayout\"] = True\n",
     "\n",
@@ -417,7 +417,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "plot_comparison_with_ref(positive)"
    ]
@@ -429,7 +429,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "plot_comparison_with_ref(negative)"
    ]
diff --git a/600A/AN_600A_RCBXHV_FPA.ipynb b/600A/AN_600A_RCBXHV_FPA.ipynb
index 3ffc874e751a54a92c98b72d29f58bffe4f5a745..db6bbe66e92b8fd830cd024f56f34b47f93e2c70 100644
--- a/600A/AN_600A_RCBXHV_FPA.ipynb
+++ b/600A/AN_600A_RCBXHV_FPA.ipynb
@@ -345,7 +345,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "analysis_rcbxh.plot_coupled_circuit_current(i_meas_rcbxh_df, i_ref_rcbxh_df, i_meas_rcbxv_df, i_ref_rcbxv_df, timestamp_fgc_rcbxh, timestamp_fgc_rcbxv, circuit_names)"
    ]
   },
diff --git a/600A/AN_600A_RCDO_FPA.ipynb b/600A/AN_600A_RCDO_FPA.ipynb
index 54ec3380c6f9f186d0738a738994de0fb56369ca..29b7d869b3828374ece3320e91ec57d00157d972 100644
--- a/600A/AN_600A_RCDO_FPA.ipynb
+++ b/600A/AN_600A_RCDO_FPA.ipynb
@@ -356,7 +356,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "analysis_rcd.plot_coupled_circuit_current(i_meas_rcd_df, i_ref_rcd_df, i_meas_rco_df, i_ref_rco_df, timestamp_fgc_rcd, timestamp_fgc_rco, circuit_names)"
    ]
diff --git a/60A/AN_60A_FPA.ipynb b/60A/AN_60A_FPA.ipynb
index f2f42e95f9c0caeac0e18b21164ae544cba4331d..d47a7dbbc577d728d174a58dbf01141518682b50 100644
--- a/60A/AN_60A_FPA.ipynb
+++ b/60A/AN_60A_FPA.ipynb
@@ -269,7 +269,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df, i_a_df, i_ref_df])"
    ]
diff --git a/80-120A/AN_80-120A_FPA.ipynb b/80-120A/AN_80-120A_FPA.ipynb
index 81e78f74538d353b0a8cdfd84408e7279ea23975..b26d46fecf405cca8d57465ad7b9ac09d03e803a 100644
--- a/80-120A/AN_80-120A_FPA.ipynb
+++ b/80-120A/AN_80-120A_FPA.ipynb
@@ -274,7 +274,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df, i_a_df, i_ref_df])"
    ]
@@ -325,7 +325,7 @@
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "plt.rcParams[\"figure.figsize\"] = [15, 7]\n",
     "ax = None\n",
diff --git a/ipd/AN_IPD_FPA.ipynb b/ipd/AN_IPD_FPA.ipynb
index 36a0ea8fc8101894a6d4968b8e6934256c8eae9a..f9c45f045d777c567ef402e77c77b673e6a37e72 100644
--- a/ipd/AN_IPD_FPA.ipynb
+++ b/ipd/AN_IPD_FPA.ipynb
@@ -289,7 +289,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "tau_ipd = analysis.calculate_i_meas_tau([i_meas_df], duration_decay=(0, 2))\n",
     "\n",
diff --git a/ipd/AN_IPD_PIC2.ipynb b/ipd/AN_IPD_PIC2.ipynb
index 2a8ff4098608b7fb5200ac58c98942243cc6fef0..1035a4d4e55b24df0c197b8b6090f080b366a88d 100644
--- a/ipd/AN_IPD_PIC2.ipynb
+++ b/ipd/AN_IPD_PIC2.ipynb
@@ -185,7 +185,7 @@
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "plt.rcParams[\"figure.figsize\"] = [15, 7]\n",
     "\n",
     "\n",
diff --git a/ipd/AN_IPD_PLI1.c2.ipynb b/ipd/AN_IPD_PLI1.c2.ipynb
index 94f5009fdbb590c64c71a0ca9a6f298fcf2e0bfe..2fba41f51166bdc2eeef45099278a5a35af874ae 100644
--- a/ipd/AN_IPD_PLI1.c2.ipynb
+++ b/ipd/AN_IPD_PLI1.c2.ipynb
@@ -291,7 +291,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df])"
    ]
   },
diff --git a/ipd/AN_IPD_PLI2.f2.ipynb b/ipd/AN_IPD_PLI2.f2.ipynb
index 59f6279bd68658d7c85de6c4a48acc0d1acdec35..5b70b1456b45894d29cdac3b6a049c830ee47aa6 100644
--- a/ipd/AN_IPD_PLI2.f2.ipynb
+++ b/ipd/AN_IPD_PLI2.f2.ipynb
@@ -311,7 +311,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_nxcals_df])"
    ]
diff --git a/ipd/AN_IPD_PLI3.c5.ipynb b/ipd/AN_IPD_PLI3.c5.ipynb
index fe86843ed0ef8086eadcaa28dbb86c68251639f6..a11a852cf5a0e19fea346d04bd0b189e25fd610b 100644
--- a/ipd/AN_IPD_PLI3.c5.ipynb
+++ b/ipd/AN_IPD_PLI3.c5.ipynb
@@ -296,7 +296,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df])"
    ]
   },
diff --git a/ipd/AN_IPD_PNO.a8.ipynb b/ipd/AN_IPD_PNO.a8.ipynb
index 4293d97e871ba7d8fbe427ca4023b3056e16122d..9112667f761e10b71aad3f8d8b030ce5df039b24 100644
--- a/ipd/AN_IPD_PNO.a8.ipynb
+++ b/ipd/AN_IPD_PNO.a8.ipynb
@@ -303,7 +303,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df])"
    ]
   },
diff --git a/ipd/AN_IPD_PNO.c6.ipynb b/ipd/AN_IPD_PNO.c6.ipynb
index 03d5ddf56fcb9a61bddb7182f5ed8785a4b26ae4..ac38c03d28a13722eca5579c693e87454b0810e5 100644
--- a/ipd/AN_IPD_PNO.c6.ipynb
+++ b/ipd/AN_IPD_PNO.c6.ipynb
@@ -306,7 +306,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "analysis.plot_i_meas_pc(circuit_name, timestamp_fgc, [i_meas_df])"
    ]
   },
diff --git a/ipq/AN_IPQ_FPA.ipynb b/ipq/AN_IPQ_FPA.ipynb
index 435120248c15ee4be68c39089f5b68a90291bb5e..628fff8f4e84c576b2ad9c33c7ef01f7e379dfb4 100644
--- a/ipq/AN_IPQ_FPA.ipynb
+++ b/ipq/AN_IPQ_FPA.ipynb
@@ -286,7 +286,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "ipc_dfs = [\n",
     "    lhcsmnb.utils.append_to_column_name(i_meas_b1_df, 0, '_B1'),\n",
diff --git a/ipq/AN_IPQ_PIC2.ipynb b/ipq/AN_IPQ_PIC2.ipynb
index dbd98384a378cd6f39a12256863a25359fc42667..59bcf061637fb36db3b059ad5e41c523b959a917 100644
--- a/ipq/AN_IPQ_PIC2.ipynb
+++ b/ipq/AN_IPQ_PIC2.ipynb
@@ -185,7 +185,7 @@
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "plt.rcParams[\"figure.figsize\"] = [15, 7]\n",
     "\n",
     "\n",
diff --git a/ipq/AN_IPQ_PLI2.e3.ipynb b/ipq/AN_IPQ_PLI2.e3.ipynb
index 705d5f2ba2f67b5c059ea679f8837f3374f165a2..358a7107b785df60326e6c93738c42b048b32f22 100644
--- a/ipq/AN_IPQ_PLI2.e3.ipynb
+++ b/ipq/AN_IPQ_PLI2.e3.ipynb
@@ -288,7 +288,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%sB1, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ipq_analysis.plot_i_meas(i_meas_b1_df, title=title)"
    ]
diff --git a/ipq/AN_IPQ_PLI2.f3.ipynb b/ipq/AN_IPQ_PLI2.f3.ipynb
index a9fda840016d292ced4c5185f10bb637e50766bc..ecde4063334bc9ef2a4ad339087b7322879ffb34 100644
--- a/ipq/AN_IPQ_PLI2.f3.ipynb
+++ b/ipq/AN_IPQ_PLI2.f3.ipynb
@@ -312,7 +312,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "ipc_dfs = [\n",
     "    lhcsmnb.utils.append_to_column_name(i_meas_b1_df, 0, '_B1'),\n",
diff --git a/ipq/AN_IPQ_PNO.a7.ipynb b/ipq/AN_IPQ_PNO.a7.ipynb
index c6be6db81a0f9adacde7fedd8369fc0bd7349025..d061345e6015a89f2f505d74a9ec031d931f9c0e 100644
--- a/ipq/AN_IPQ_PNO.a7.ipynb
+++ b/ipq/AN_IPQ_PNO.a7.ipynb
@@ -230,7 +230,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "\n",
diff --git a/ipq/AN_IPQ_PNO.c4.ipynb b/ipq/AN_IPQ_PNO.c4.ipynb
index 58af9feb7fc90f80a3c6a9a8dd3fb5164a3eaaaf..629996c191137fef17e540cd934081a158f6b13e 100644
--- a/ipq/AN_IPQ_PNO.c4.ipynb
+++ b/ipq/AN_IPQ_PNO.c4.ipynb
@@ -252,7 +252,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "title = '%sB1, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ipq_analysis.plot_i_meas_with_current_plateau(i_meas_b1_df, t0=i_meas_b1_raw_df.index[0], plateau_start=plateau_start_b1, plateau_end=plateau_end_b1, title=title)"
diff --git a/it/AN_IT_FPA.ipynb b/it/AN_IT_FPA.ipynb
index 78d0df9a7a2dec3c4b22f39c8b70bb9ceab867d4..662fe6e2856d802a1e8ad15f5eec258365e686d8 100644
--- a/it/AN_IT_FPA.ipynb
+++ b/it/AN_IT_FPA.ipynb
@@ -314,7 +314,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "it_analysis.plot_i_meas_pc(circuit_name, timestamp_fgc_rqx, [i_meas_rqx_df, i_meas_rtqx1_df, i_meas_rtqx2_df, i_ref_rqx_df, i_ref_rtqx1_df, i_ref_rtqx2_df])"
    ]
   },
diff --git a/it/AN_IT_PIC2.ipynb b/it/AN_IT_PIC2.ipynb
index d71e2e1a81cbdf46458dae8f205122180e5a50b2..101e7f71d33cd952165acbe27e92ef9dacb48e42 100644
--- a/it/AN_IT_PIC2.ipynb
+++ b/it/AN_IT_PIC2.ipynb
@@ -325,7 +325,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PLI3.f6.ipynb b/it/AN_IT_PLI3.f6.ipynb
index 1fe294429529d2ba5a6fa2b1985694fccc5dd042..e25c3e93b006f3caa78ad228a066ab33c33de974 100644
--- a/it/AN_IT_PLI3.f6.ipynb
+++ b/it/AN_IT_PLI3.f6.ipynb
@@ -342,7 +342,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PNO.a9.ipynb b/it/AN_IT_PNO.a9.ipynb
index e70dfc6b4db9be6e16a41e62442112dba63687e5..e96b089450b242d4b4d3bfbd463bfea551bff60d 100644
--- a/it/AN_IT_PNO.a9.ipynb
+++ b/it/AN_IT_PNO.a9.ipynb
@@ -290,7 +290,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ax = PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PNO.d14.ipynb b/it/AN_IT_PNO.d14.ipynb
index 97f658e2693d08652157605fb064a7253f9688b6..a62a2950a18bfd2ec2b3f42bac91885179a48ba7 100644
--- a/it/AN_IT_PNO.d14.ipynb
+++ b/it/AN_IT_PNO.d14.ipynb
@@ -269,7 +269,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ax = PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PNO.d15.ipynb b/it/AN_IT_PNO.d15.ipynb
index 7134e2a3ebd1c0e6ade24f03fd46f964372999fc..58893c4edd466f1a9816687a7a0414d76085ca2d 100644
--- a/it/AN_IT_PNO.d15.ipynb
+++ b/it/AN_IT_PNO.d15.ipynb
@@ -269,7 +269,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ax = PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PNO.d16.ipynb b/it/AN_IT_PNO.d16.ipynb
index 015fd930c3e11019ee7d5ca4cd6fa04c93c21596..55940dd8adfa9cede62ded502cfcdae674f8af86 100644
--- a/it/AN_IT_PNO.d16.ipynb
+++ b/it/AN_IT_PNO.d16.ipynb
@@ -270,7 +270,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ax = PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/it/AN_IT_PNO.d17.ipynb b/it/AN_IT_PNO.d17.ipynb
index e0353f00b7ea3fe2743ca8fb525fb553126484be..8611a95ceea61ef83e2ce47fa72e7629cd52baad 100644
--- a/it/AN_IT_PNO.d17.ipynb
+++ b/it/AN_IT_PNO.d17.ipynb
@@ -282,7 +282,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "ax = PlotBuilder().with_signal([i_meas_rqx_nxcals_df, i_meas_rtqx2_nxcals_df], title=title, grid=True) \\\n",
     "        .with_ylabel(ylabel='I_MEAS_RQX, I_MEAS_RTQX2, [A]') \\\n",
diff --git a/nqps/nQPS_Viewer.ipynb b/nqps/nQPS_Viewer.ipynb
index 377e26092e5eaf9ebea5fd9289e5048df1e84ff3..9e41cb33413a83d53e932e4272a3dfcc658df84c 100644
--- a/nqps/nQPS_Viewer.ipynb
+++ b/nqps/nQPS_Viewer.ipynb
@@ -214,7 +214,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "ax = i_meas_df.plot(figsize=(13, 6.5), grid=True)\n",
     "ax2 = ax.twinx()\n",
     "for u_res_df in u_res_dfs:\n",
@@ -275,7 +275,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "ax = i_meas_df.plot(figsize=(13, 6.5), grid=True)\n",
     "ax2 = ax.twinx()\n",
     "for u_res_df in u_res_1_dfs:\n",
@@ -304,7 +304,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "ax = i_meas_df.plot(figsize=(13, 6.5), grid=True)\n",
     "ax2 = ax.twinx()\n",
     "for u_res_df in u_res_2_dfs:\n",
@@ -359,7 +359,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "ax = i_meas_df.plot(figsize=(13, 6.5), grid=True)\n",
     "ax2 = ax.twinx()\n",
     "for u_res_df in (u_res_1_dfs[i1], u_res_1_dfs[i2]):\n",
diff --git a/papermill_nxcals/test/test_engine.py b/papermill_nxcals/test/test_engine.py
index 902a5e1e5950177c1bce588728f1d6063de195a5..68768952c310182cbc71e5eb63c44fa07082e4bb 100644
--- a/papermill_nxcals/test/test_engine.py
+++ b/papermill_nxcals/test/test_engine.py
@@ -72,7 +72,7 @@ class TestPapermillNxcalsEngine(unittest.TestCase):
 def _get_input_notebook():
     notebook = nbf.new_notebook()
     text = '## Test Markdown Text\nsome description\n'
-    code = 'for i in range(4):\n  print(f"test iteration number {i}")\n%matplotlib notebook'
+    code = 'for i in range(4):\n  print(f"test iteration number {i}")\n%matplotlib widget'
 
     notebook['cells'] = [nbf.new_markdown_cell(text),
                          nbf.new_code_cell(code)]
diff --git a/pgc/AN_PGC1.ipynb b/pgc/AN_PGC1.ipynb
index 3d6999c315637f3494572f93f99c7c003b056d27..733c532ee0a5441a77b38a4da7b7e3977e4bcb6c 100644
--- a/pgc/AN_PGC1.ipynb
+++ b/pgc/AN_PGC1.ipynb
@@ -496,7 +496,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "t_start_title = t_start[0:19]\n",
     "\n",
     "if len(i_meas_13kA_dfs) > 0:\n",
diff --git a/pgc/AN_PGC2.ipynb b/pgc/AN_PGC2.ipynb
index 6e72d94c0087c3f4b6bf2f0954f9bbe68fc810e7..c25ec9e5fa9a5b029c01d678ea1dfda6c7a91186 100644
--- a/pgc/AN_PGC2.ipynb
+++ b/pgc/AN_PGC2.ipynb
@@ -519,7 +519,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "t_start_title = t_start[0:19]\n",
     "\n",
     "if len(i_meas_13kA_dfs) > 0:\n",
diff --git a/pgc/AN_PGC3.ipynb b/pgc/AN_PGC3.ipynb
index 794861c853a4adc9f5589057cd1a9643ab9801fe..ff8f2d009a7499797dcee7e54deca930b6a4762e 100644
--- a/pgc/AN_PGC3.ipynb
+++ b/pgc/AN_PGC3.ipynb
@@ -519,7 +519,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "t_start_title = t_start[0:19]\n",
     "\n",
     "if len(i_meas_13kA_dfs) > 0:\n",
diff --git a/pgc/AN_PGC4.ipynb b/pgc/AN_PGC4.ipynb
index dc2300e59897ac5341432e1ba6fd0bb9f54f59ea..6de9d213014b2a9b684937eab8fe0408f32693ec 100644
--- a/pgc/AN_PGC4.ipynb
+++ b/pgc/AN_PGC4.ipynb
@@ -518,7 +518,7 @@
    "outputs": [],
    "source": [
     "import matplotlib.pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "t_start_title = t_start[0:19]\n",
     "\n",
     "if len(i_meas_13kA_dfs) > 0:\n",
diff --git a/qh/HWC_QHD_PM_LIST_CCC.ipynb b/qh/HWC_QHD_PM_LIST_CCC.ipynb
index a48fef73bedf744f1dbb040106a5e6548cbd64ed..9591d463541f1b9d789e488e2f9399ca94429196 100644
--- a/qh/HWC_QHD_PM_LIST_CCC.ipynb
+++ b/qh/HWC_QHD_PM_LIST_CCC.ipynb
@@ -169,7 +169,7 @@
    "source": [
     "%%capture\n",
     "import matplotlib\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "complete_output = ccc_output.get_output(qhccc)"
    ]
   },
diff --git a/qh/HWC_voltage_QHDA.ipynb b/qh/HWC_voltage_QHDA.ipynb
index 5c48fd0ec46a24f097dc813a43f52c67c603d0c8..d1e8cdd4a60f7a055ecf600b0d487cf76840728b 100644
--- a/qh/HWC_voltage_QHDA.ipynb
+++ b/qh/HWC_voltage_QHDA.ipynb
@@ -273,7 +273,7 @@
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "plt.rcParams[\"figure.figsize\"] = [15, 7]\n",
     "\n",
     "ax = None\n",
diff --git a/qh/HWC_voltage_current_QHDA.ipynb b/qh/HWC_voltage_current_QHDA.ipynb
index 9228db6114466719e9e661032b1ec43a806a2f8d..7911a768b53a3aa59edb8519a4b1bd91490e08b3 100644
--- a/qh/HWC_voltage_current_QHDA.ipynb
+++ b/qh/HWC_voltage_current_QHDA.ipynb
@@ -387,7 +387,7 @@
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "plt.rcParams[\"figure.figsize\"] = [15, 7]\n",
     "\n",
     "ax = None\n",
diff --git a/rb/AN_RB_FPA.ipynb b/rb/AN_RB_FPA.ipynb
index a359c2636c3c71ed2db4e5b92e7ccd7db22d4c04..0be3cecde19ea2fda84ee81ef391189a57bfdafc 100644
--- a/rb/AN_RB_FPA.ipynb
+++ b/rb/AN_RB_FPA.ipynb
@@ -73,10 +73,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -136,12 +136,12 @@
    "cell_type": "markdown",
    "metadata": {
     "deletable": false,
-    "tags": [
-     "skip_cell"
-    ],
     "pycharm": {
      "name": "#%% md\n"
-    }
+    },
+    "tags": [
+     "skip_cell"
+    ]
    },
    "source": [
     "In order to perform the analysis of a FPA in an RB circuit please:\n",
@@ -174,13 +174,13 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
+    "pycharm": {
+     "name": "#%%\n"
+    },
     "scrolled": false,
     "tags": [
      "parameters"
-    ],
-    "pycharm": {
-     "name": "#%%\n"
-    }
+    ]
    },
    "outputs": [],
    "source": [
@@ -207,13 +207,13 @@
    "execution_count": null,
    "metadata": {
     "deleteable": true,
+    "pycharm": {
+     "name": "#%%\n"
+    },
     "scrolled": false,
     "tags": [
      "skip_output"
-    ],
-    "pycharm": {
-     "name": "#%%\n"
-    }
+    ]
    },
    "outputs": [],
    "source": [
@@ -344,10 +344,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -473,10 +473,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": true,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": true
    },
    "outputs": [],
    "source": [
@@ -544,10 +544,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -592,14 +592,14 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rb_analysis.analyze_i_meas_pc(circuit_name, timestamp_fgc, timestamp_fgc_ref, min(timestamp_pic), i_meas_df, i_meas_ref_df)\n",
     "rb_analysis.calculate_current_miits_i_meas_i_a(i_meas_df, i_a_df, t_quench=0, col_name='MIITS_circ')\n",
     "rb_analysis.calculate_quench_current(i_meas_df, t_quench=0, col_name='I_Q_circ')\n",
@@ -699,12 +699,12 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "tags": [
-     "skip_cell"
-    ],
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "tags": [
+     "skip_cell"
+    ]
    },
    "outputs": [],
    "source": [
@@ -765,10 +765,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -781,10 +781,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -832,10 +832,10 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "scrolled": true,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": true
    },
    "outputs": [],
    "source": [
@@ -864,7 +864,7 @@
    "source": [
     "from lhcsmapi.pyedsl.PlotBuilder import PlotBuilder\n",
     "\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "signals = 'I_EARTH_CPCNT(t) for RCD, RCO, RCS circuits'\n",
     "title = '%s %s I_MEAS(t) and %s' % (Time.to_string_short(timestamp_fgc), circuit_name, signals)\n",
     "xlim = [-1200, 800]\n",
@@ -921,10 +921,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -938,10 +938,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -980,10 +980,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1124,34 +1124,40 @@
   },
   {
    "cell_type": "markdown",
-   "source": [
-    "### 8.1.2. All U_DIODE_RB PM signals as they are\n",
-    "Note that by default both U_DIODE_RB and U_REF_N1 are shown - adjust `signals_to_plot` according to your needs."
-   ],
    "metadata": {
     "pycharm": {
      "name": "#%% md\n"
     }
-   }
+   },
+   "source": [
+    "### 8.1.2. All U_DIODE_RB PM signals as they are\n",
+    "Note that by default both U_DIODE_RB and U_REF_N1 are shown - adjust `signals_to_plot` according to your needs."
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
-   "outputs": [],
-   "source": [
-    "%%time\n",
-    "n_qps_all_dfs = rb_query.query_voltage_nqps_pm(source_timestamp_nqps_df)"
-   ],
    "metadata": {
     "collapsed": false,
     "pycharm": {
      "name": "#%%\n"
     }
-   }
+   },
+   "outputs": [],
+   "source": [
+    "%%time\n",
+    "n_qps_all_dfs = rb_query.query_voltage_nqps_pm(source_timestamp_nqps_df)"
+   ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
+   "metadata": {
+    "collapsed": false,
+    "pycharm": {
+     "name": "#%%\n"
+    }
+   },
    "outputs": [],
    "source": [
     "from matplotlib import pyplot as plt\n",
@@ -1170,13 +1176,7 @@
     "plt.xlabel('time, s', fontsize = 16)\n",
     "plt.title(f'{circuit_name}, {Time.to_string_short(timestamp_fgc)}', loc='left', fontsize = 18)\n",
     "plt.show()"
-   ],
-   "metadata": {
-    "collapsed": false,
-    "pycharm": {
-     "name": "#%%\n"
-    }
-   }
+   ]
   },
   {
    "cell_type": "markdown",
@@ -1194,14 +1194,14 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rb_analysis.analyze_u_diode_nqps(circuit_name, timestamp_fgc, i_meas_df, u_diode_rb_dfs, 'U_DIODE_RB', 'DIODE_RB', xlim=(-25, 500))"
    ]
   },
@@ -1210,10 +1210,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1225,15 +1225,15 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
     "if not source_timestamp_qds_df.empty:\n",
-    "    %matplotlib notebook\n",
+    "    %matplotlib widget\n",
     "    u_diode_with_quench_rb_dfs = rb_analysis.filter_quenched_magnets(u_diode_rb_dfs, results_table['Position'])\n",
     "    rb_analysis.analyze_u_diode_nqps(circuit_name, timestamp_fgc, i_meas_df, u_diode_with_quench_rb_dfs, 'U_DIODE_RB', 'DIODE_RB', legend=True, xlim=(-25, 500))\n",
     "    print(\"done!\")"
@@ -1243,10 +1243,10 @@
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1386,10 +1386,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1436,10 +1436,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1505,10 +1505,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1553,10 +1553,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1618,10 +1618,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1684,10 +1684,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1878,10 +1878,10 @@
    "execution_count": null,
    "metadata": {
     "deletable": false,
-    "scrolled": false,
     "pycharm": {
      "name": "#%%\n"
-    }
+    },
+    "scrolled": false
    },
    "outputs": [],
    "source": [
@@ -1936,7 +1936,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.11"
+   "version": "3.9.18"
   },
   "sparkconnect": {
    "bundled_options": [
@@ -1966,4 +1966,4 @@
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
\ No newline at end of file
+}
diff --git a/rb/AN_RB_FPA_SNAP.ipynb b/rb/AN_RB_FPA_SNAP.ipynb
index 18699d02134cc7456f394a4e5eeb8ad48e2f38ab..897dfd1cefaf605e206f9db6d902e406ef64ad37 100644
--- a/rb/AN_RB_FPA_SNAP.ipynb
+++ b/rb/AN_RB_FPA_SNAP.ipynb
@@ -245,7 +245,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "rb_analysis.display_qps_signal_browser(u_qds_dfs, source_timestamp_qds_df, timestamp_fgc)"
    ]
diff --git a/rb/AN_RB_PIC2.ipynb b/rb/AN_RB_PIC2.ipynb
index e952eaf007cc9378941196957670bd6b1e3359a0..a8a609b5cf7830bf99bb6b6448e1959e3ac03965 100644
--- a/rb/AN_RB_PIC2.ipynb
+++ b/rb/AN_RB_PIC2.ipynb
@@ -271,7 +271,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "ax = i_meas_nxcals_df.plot(figsize=(13, 6.5), grid=True)\n",
     "ax.set_xlabel(\"time, [s]\", fontsize=15)\n",
diff --git a/rb/AN_RB_PLI1.a2.ipynb b/rb/AN_RB_PLI1.a2.ipynb
index 15d0f30d84d32ad744ab74262f614c8d36b9b467..453699353d9f3fa9ef59b2cde4d9b99a1fc5cd82 100644
--- a/rb/AN_RB_PLI1.a2.ipynb
+++ b/rb/AN_RB_PLI1.a2.ipynb
@@ -217,7 +217,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/AN_RB_PLI1.b2.ipynb b/rb/AN_RB_PLI1.b2.ipynb
index d2eee1be5ffcebbc394085cca8b017b69f602e71..7b32daf0efdb70a129b5bd3d82d479ec59cedb82 100644
--- a/rb/AN_RB_PLI1.b2.ipynb
+++ b/rb/AN_RB_PLI1.b2.ipynb
@@ -311,7 +311,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test,\n",
     "                                                t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas(i_meas_nxcals_df, title=title)"
diff --git a/rb/AN_RB_PLI1.d2.ipynb b/rb/AN_RB_PLI1.d2.ipynb
index 068451fbaa010a359cd0f6076b7b64c235af605d..76c0e660265204c9c7d247b69ff439cd5b9d1d0b 100644
--- a/rb/AN_RB_PLI1.d2.ipynb
+++ b/rb/AN_RB_PLI1.d2.ipynb
@@ -324,7 +324,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas(i_meas_nxcals_df, title=title)"
diff --git a/rb/AN_RB_PLI2.b2.ipynb b/rb/AN_RB_PLI2.b2.ipynb
index e87ec0537151f9d57c60d68900d21f24f8808e1b..82eeebf3e5380b3e80193b7720fa6666ad7801d7 100644
--- a/rb/AN_RB_PLI2.b2.ipynb
+++ b/rb/AN_RB_PLI2.b2.ipynb
@@ -311,7 +311,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas(i_meas_nxcals_df, title=title)"
    ]
diff --git a/rb/AN_RB_PLI2.f1.ipynb b/rb/AN_RB_PLI2.f1.ipynb
index ef2945617a051b90a67880a4627329e1e6ed8344..25038b05c18f01a1c2f21f0bad19d49d20fe5b1e 100644
--- a/rb/AN_RB_PLI2.f1.ipynb
+++ b/rb/AN_RB_PLI2.f1.ipynb
@@ -439,7 +439,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rb_analysis.analyze_i_meas_pc(circuit_name, timestamp_fgc, timestamp_fgc_ref, min(timestamp_pic), i_meas_df, i_meas_ref_df)\n",
     "rb_analysis.calculate_current_miits_i_meas_i_a(i_meas_df, i_a_df, t_quench=0, col_name='MIITS_circ')\n",
     "rb_analysis.calculate_quench_current(i_meas_df, t_quench=0, col_name='I_Q_circ')\n",
@@ -489,7 +489,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rb_analysis.analyze_i_earth_pcnt_pc(circuit_type, circuit_name, timestamp_fgc, i_meas_df, i_meas_ref_df, i_earth_pcnt_df, i_earth_pcnt_ref_df, xlim=(-50, 350))"
    ]
   },
diff --git a/rb/AN_RB_PLI2.s1.ipynb b/rb/AN_RB_PLI2.s1.ipynb
index fc6a3440ff7d8a7ca22bec63534d091b9bb4b852..7c3b45c493463ce4eeceaa0e64d2538cd92735aa 100644
--- a/rb/AN_RB_PLI2.s1.ipynb
+++ b/rb/AN_RB_PLI2.s1.ipynb
@@ -223,7 +223,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/AN_RB_PLI3.a5.ipynb b/rb/AN_RB_PLI3.a5.ipynb
index 2f71fbe1e6701bbe19aad4900bf072191124bde2..7b88efd8e152829e552b474316de1e88735ec808 100644
--- a/rb/AN_RB_PLI3.a5.ipynb
+++ b/rb/AN_RB_PLI3.a5.ipynb
@@ -243,7 +243,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/AN_RB_PLI3.d2.ipynb b/rb/AN_RB_PLI3.d2.ipynb
index 53e9851f0f2f598fa676a921d5d3855c3cfd9844..3b4f2e7ed0fc14e656659f53a0dff0f7b5f4a182 100644
--- a/rb/AN_RB_PLI3.d2.ipynb
+++ b/rb/AN_RB_PLI3.d2.ipynb
@@ -377,7 +377,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas(i_meas_nxcals_df, title=title)"
    ]
diff --git a/rb/AN_RB_PLIM.b2.ipynb b/rb/AN_RB_PLIM.b2.ipynb
index b88f29f1082ff8c3de428551356a6587532b8786..fdbfca559e68e374d2d1445288b056e70cd19ceb 100644
--- a/rb/AN_RB_PLIM.b2.ipynb
+++ b/rb/AN_RB_PLIM.b2.ipynb
@@ -319,7 +319,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rb_analysis.plot_i_meas(i_meas_nxcals_df, title=title)"
    ]
diff --git a/rb/AN_RB_PLIS.s2.ipynb b/rb/AN_RB_PLIS.s2.ipynb
index ae467e637a538c55cca6921b94be16800c84bea8..b57ef766a5dd71b730ee948e6e1f871c15ba5a62 100644
--- a/rb/AN_RB_PLIS.s2.ipynb
+++ b/rb/AN_RB_PLIS.s2.ipynb
@@ -228,7 +228,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/AN_RB_PNO.a6.ipynb b/rb/AN_RB_PNO.a6.ipynb
index a72898a2922023fedf4e01d873f9627d5cd7ad20..1f8acd2d1adcb7675bd35544a3c9165db55e3dc4 100644
--- a/rb/AN_RB_PNO.a6.ipynb
+++ b/rb/AN_RB_PNO.a6.ipynb
@@ -242,7 +242,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/AN_RB_PNO.b2.ipynb b/rb/AN_RB_PNO.b2.ipynb
index add383439aceb8caf8e5a096e7d3f7823f141721..275685c5f59af82bd5e008ce7a1fcc8fe9ebbe99 100644
--- a/rb/AN_RB_PNO.b2.ipynb
+++ b/rb/AN_RB_PNO.b2.ipynb
@@ -345,7 +345,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "rb_analysis.plot_i_meas_with_current_plateau(i_meas_nxcals_df, t0=i_meas_raw_nxcals_df.index[0], plateau_start=plateau_start, plateau_end=plateau_end, title=title)"
    ]
diff --git a/rb/quench_digger2.ipynb b/rb/quench_digger2.ipynb
index a8d71a8bb858348b4f1af87b0f9119c9b9b673ad..d7f084f2daaa2c5c835eb8707c8a78ac33ae11e9 100644
--- a/rb/quench_digger2.ipynb
+++ b/rb/quench_digger2.ipynb
@@ -244,7 +244,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rb_analysis.analyze_u_diode_nqps(circuit_name, timestamp_fgc, i_meas_df, u_diode_rb_dfs, 'U_DIODE_RB', 'DIODE_RB', xlim=(-25, 350))"
    ]
   },
diff --git a/rq/AN_RQ_FPA.ipynb b/rq/AN_RQ_FPA.ipynb
index 73f13ab3ad9767d4e9e709a2f0af01bbe89caa42..14dae0dfc4a8b378cdcd66dd360fda246f70805e 100644
--- a/rq/AN_RQ_FPA.ipynb
+++ b/rq/AN_RQ_FPA.ipynb
@@ -518,7 +518,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_meas_pc(circuit_names[0], timestamp_fgc_rqd, timestamp_fgc_ref_rqd, timestamp_pic_rqd, i_meas_rqd_df, i_meas_ref_rqd_df)\n",
     "rq_analysis.calculate_current_miits_i_meas_i_a(i_meas_rqd_df, i_a_rqd_df, t_quench=0, col_name='MIITS_RQD')\n",
     "rq_analysis.calculate_quench_current(i_meas_rqd_df, t_quench=0, col_name='I_Q_RQD')\n",
@@ -536,7 +536,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_meas_pc(circuit_names[1], timestamp_fgc_rqf, timestamp_fgc_ref_rqf, timestamp_pic_rqf, i_meas_rqf_df, i_meas_ref_rqf_df)\n",
     "rq_analysis.calculate_current_miits_i_meas_i_a(i_meas_rqf_df, i_a_rqd_df, t_quench=0, col_name='MIITS_RQF')\n",
     "rq_analysis.calculate_quench_current(i_meas_rqf_df, t_quench=0, col_name='I_Q_RQF')\n",
@@ -577,7 +577,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pc(circuit_names[0], timestamp_fgc_rqd, i_a_rqd_df, i_earth_rqd_df, i_earth_rqd_ref_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqd_df, col_name='I_Earth_max_RQD')"
    ]
@@ -594,7 +594,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pc(circuit_names[1], timestamp_fgc_rqf, i_a_rqf_df, i_earth_rqf_df, i_earth_rqf_ref_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqf_df, col_name='I_Earth_max_RQF')"
    ]
@@ -610,7 +610,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[0], timestamp_fgc_rqd, i_meas_rqd_df, i_meas_ref_rqd_df, i_earth_pcnt_rqd_df, i_earth_pcnt_rqd_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },
@@ -625,7 +625,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[1], timestamp_fgc_rqf, i_meas_rqf_df, i_meas_ref_rqf_df, i_earth_pcnt_rqf_df, i_earth_pcnt_rqf_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },
@@ -670,7 +670,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_char_time_u_dump_res_ee(circuit_names[0], timestamp_fgc_rqd, u_dump_res_rqd_df, i_meas_rqd_df)\n",
     "rq_analysis.results_table['U_EE_max_RQD'] = u_dump_res_rqd_df.max()[0]"
    ]
@@ -687,7 +687,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_char_time_u_dump_res_ee(circuit_names[1], timestamp_fgc_rqf, u_dump_res_rqf_df, i_meas_rqf_df)\n",
     "rq_analysis.results_table['U_EE_max_RQF'] = u_dump_res_rqf_df.max()[0]"
    ]
@@ -703,7 +703,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_delay_time_u_dump_res_ee(circuit_names[0], timestamp_fgc_rqd, timestamp_pic_rqd, timestamp_ee_rqd, i_a_rqd_df, i_ref_rqd_df, u_dump_res_rqd_df)"
    ]
   },
@@ -718,7 +718,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_delay_time_u_dump_res_ee(circuit_names[1], timestamp_fgc_rqf, timestamp_pic_rqf, timestamp_ee_rqf, i_a_rqf_df, i_ref_rqf_df, u_dump_res_rqf_df)"
    ]
   },
@@ -754,7 +754,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_ee_temp(circuit_names[0], timestamp_ee_rqd, [t_res_0_rqd_df, t_res_1_rqd_df], [t_res_0_rqd_ref_df, t_res_1_rqd_ref_df], abs_margin=25, scaling=1)"
    ]
   },
@@ -769,7 +769,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_ee_temp(circuit_names[1], timestamp_ee_rqf, [t_res_0_rqf_df, t_res_1_rqf_df], [t_res_0_rqf_ref_df, t_res_1_rqf_ref_df], abs_margin=25, scaling=1)"
    ]
   },
@@ -854,7 +854,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_u_diode_nqps(circuit_names[0], timestamp_fgc_rqd, i_meas_rqd_df, u_diode_rqd_dfs, 'U_DIODE_RQD', system='DIODE_RQD')"
    ]
   },
@@ -869,7 +869,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_u_diode_nqps(circuit_names[1], timestamp_fgc_rqf, i_meas_rqf_df, u_diode_rqf_dfs, 'U_DIODE_RQF', system='DIODE_RQF')"
    ]
   },
diff --git a/rq/AN_RQ_PIC2.ipynb b/rq/AN_RQ_PIC2.ipynb
index b02c917deaf6251dd289bf1f824b3d99a553b473..70806c22bfcae7361953f7e84761273f635b3612 100644
--- a/rq/AN_RQ_PIC2.ipynb
+++ b/rq/AN_RQ_PIC2.ipynb
@@ -293,7 +293,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "i_meas_rqd_nxcals_df.rename(columns={'I_MEAS': 'I_MEAS:' + circuit_names[0]}, inplace=True)\n",
     "i_meas_rqf_nxcals_df.rename(columns={'I_MEAS': 'I_MEAS:' + circuit_names[1]}, inplace=True)\n",
diff --git a/rq/AN_RQ_PLI1.b3.ipynb b/rq/AN_RQ_PLI1.b3.ipynb
index 71b240811ffef652545c6f9938c836f19205256b..12a7d26cac03bd232018b1304fae94359da3c613 100644
--- a/rq/AN_RQ_PLI1.b3.ipynb
+++ b/rq/AN_RQ_PLI1.b3.ipynb
@@ -308,7 +308,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rq_analysis.plot_i_meas([i_meas_rqd_nxcals_df, i_meas_rqf_nxcals_df], title=title)"
    ]
diff --git a/rq/AN_RQ_PLI1.d2.ipynb b/rq/AN_RQ_PLI1.d2.ipynb
index 9368968114f9988c0fcbcfcfa4b759120da15ec5..0c6e5d7ed3bc2b12d06f834b7d055484d0dc6d78 100644
--- a/rq/AN_RQ_PLI1.d2.ipynb
+++ b/rq/AN_RQ_PLI1.d2.ipynb
@@ -262,7 +262,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test,\n",
     "                                                t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rq_analysis.plot_i_meas([i_meas_rqd_nxcals_df, i_meas_rqf_nxcals_df], title=title)"
diff --git a/rq/AN_RQ_PLI2.b3.ipynb b/rq/AN_RQ_PLI2.b3.ipynb
index f73302571de003d55e811d64d4c9f0f267b359fc..320c7257812077147f1f3f10d40b0f16c1c9692b 100644
--- a/rq/AN_RQ_PLI2.b3.ipynb
+++ b/rq/AN_RQ_PLI2.b3.ipynb
@@ -310,7 +310,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rq_analysis.plot_i_meas([i_meas_rqd_nxcals_df, i_meas_rqf_nxcals_df], title=title)"
    ]
diff --git a/rq/AN_RQ_PLI2.f1.ipynb b/rq/AN_RQ_PLI2.f1.ipynb
index fa117779212977292e5a4ce7c6ee4ac6f4f14b32..fe8f4e233c4bc2c799c881820982743ceb28872a 100644
--- a/rq/AN_RQ_PLI2.f1.ipynb
+++ b/rq/AN_RQ_PLI2.f1.ipynb
@@ -442,7 +442,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_meas_pc(circuit_names[0], timestamp_fgc_rqd, timestamp_fgc_ref_rqd, timestamp_pic_rqd, i_meas_rqd_df, i_meas_ref_rqd_df)\n",
     "rq_analysis.calculate_current_miits(i_meas_rqd_df, t_quench=0, col_name='MIITS_RQD')\n",
     "rq_analysis.calculate_quench_current(i_meas_rqd_df, t_quench=0, col_name='I_Q_RQD')\n",
@@ -457,7 +457,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_meas_pc(circuit_names[1], timestamp_fgc_rqf, timestamp_fgc_ref_rqf, timestamp_pic_rqf, i_meas_rqf_df, i_meas_ref_rqf_df)\n",
     "rq_analysis.calculate_current_miits(i_meas_rqf_df, t_quench=0, col_name='MIITS_RQF')\n",
     "rq_analysis.calculate_quench_current(i_meas_rqf_df, t_quench=0, col_name='I_Q_RQF')\n",
@@ -492,7 +492,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pc(circuit_names[0], timestamp_fgc_rqd, i_a_rqd_df, i_earth_rqd_df, i_earth_rqd_ref_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqd_df, col_name='I_Earth_max_RQD')"
    ]
@@ -506,7 +506,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pc(circuit_names[1], timestamp_fgc_rqf, i_a_rqf_df, i_earth_rqf_df, i_earth_rqf_ref_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqf_df, col_name='I_Earth_max_RQF')"
    ]
@@ -519,7 +519,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[0], timestamp_fgc_rqd, i_meas_rqd_df, i_meas_ref_rqd_df, i_earth_pcnt_rqd_df, i_earth_pcnt_rqd_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },
@@ -531,7 +531,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[1], timestamp_fgc_rqf, i_meas_rqf_df, i_meas_ref_rqf_df, i_earth_pcnt_rqf_df, i_earth_pcnt_rqf_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },
@@ -570,7 +570,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_char_time_u_dump_res_ee(circuit_names[0], timestamp_fgc_rqd, u_dump_res_rqd_df, i_meas_rqd_df)\n",
     "rq_analysis.results_table['U_EE_max_RQD'] = u_dump_res_rqd_df.max()[0]"
    ]
@@ -584,7 +584,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_char_time_u_dump_res_ee(circuit_names[1], timestamp_fgc_rqf, u_dump_res_rqf_df, i_meas_rqf_df)\n",
     "rq_analysis.results_table['U_EE_max_RQF'] = u_dump_res_rqf_df.max()[0]"
    ]
@@ -597,7 +597,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_delay_time_u_dump_res_ee(circuit_names[0], timestamp_fgc_rqd, timestamp_pic_rqd, timestamp_ee_rqd, i_a_rqd_df, i_ref_rqd_df, u_dump_res_rqd_df)"
    ]
   },
@@ -609,7 +609,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_delay_time_u_dump_res_ee(circuit_names[1], timestamp_fgc_rqf, timestamp_pic_rqf, timestamp_ee_rqf, i_a_rqf_df, i_ref_rqf_df, u_dump_res_rqf_df)"
    ]
   },
@@ -639,7 +639,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_ee_temp(circuit_names[0], timestamp_ee_rqd, [t_res_0_rqd_df, t_res_1_rqd_df], [t_res_0_rqd_ref_df, t_res_1_rqd_ref_df], abs_margin=25, scaling=1)"
    ]
   },
@@ -651,7 +651,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_ee_temp(circuit_names[1], timestamp_ee_rqf, [t_res_0_rqf_df, t_res_1_rqf_df], [t_res_0_rqf_ref_df, t_res_1_rqf_ref_df], abs_margin=25, scaling=1)"
    ]
   },
@@ -721,7 +721,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_u_diode_nqps(circuit_names[0], timestamp_fgc_rqd, i_meas_rqd_df, u_diode_rqd_dfs, 'U_DIODE_RQD', system='DIODE_RQD')"
    ]
   },
@@ -733,7 +733,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_u_diode_nqps(circuit_names[1], timestamp_fgc_rqf, i_meas_rqf_df, u_diode_rqf_dfs, 'U_DIODE_RQF', system='DIODE_RQF')"
    ]
   },
diff --git a/rq/AN_RQ_PLI2.s1.ipynb b/rq/AN_RQ_PLI2.s1.ipynb
index 029ad395d321861d381a5b9e587bd1eb7ad1c849..1d8f962de2e1969819281a40851594140c791207 100644
--- a/rq/AN_RQ_PLI2.s1.ipynb
+++ b/rq/AN_RQ_PLI2.s1.ipynb
@@ -244,7 +244,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s-%s, %s: %s-%s' % (circuit_names[0], circuit_names[1], hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "i_meas_nxcals_dfs[0].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[0]}, inplace=True)\n",
     "i_meas_nxcals_dfs[1].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[1]}, inplace=True)\n",
diff --git a/rq/AN_RQ_PLI3.a5.ipynb b/rq/AN_RQ_PLI3.a5.ipynb
index 0e284096dc76994bc8221165a56688887b8553a3..1d6fcbc7f4b2530062b1fe700de9c0957f93f958 100644
--- a/rq/AN_RQ_PLI3.a5.ipynb
+++ b/rq/AN_RQ_PLI3.a5.ipynb
@@ -281,7 +281,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s-%s, %s: %s-%s' % (circuit_names[0], circuit_names[1], hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "i_meas_nxcals_dfs[0] = i_meas_nxcals_dfs[0].rename(columns={i_meas_nxcals_dfs[0].columns[0]: '%s:I_MEAS' % (circuit_names[0])})\n",
     "i_meas_nxcals_dfs[1] = i_meas_nxcals_dfs[1].rename(columns={i_meas_nxcals_dfs[1].columns[0]: '%s:I_MEAS' % (circuit_names[1])})\n",
diff --git a/rq/AN_RQ_PLI3.b3.ipynb b/rq/AN_RQ_PLI3.b3.ipynb
index b725d38abdc104e68708f6f8a7e5850af0dcf8a4..590cea0939a628ca50e118fd177d91ed82bfb92e 100644
--- a/rq/AN_RQ_PLI3.b3.ipynb
+++ b/rq/AN_RQ_PLI3.b3.ipynb
@@ -337,7 +337,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = create_hwc_plot_title_with_circuit_name(circuit_name=circuit_name, hwc_test=hwc_test, t_start=t_start, t_end=t_end, signal='I_MEAS')\n",
     "rq_analysis.plot_i_meas([i_meas_rqd_nxcals_df, i_meas_rqf_nxcals_df], title=title)"
    ]
diff --git a/rq/AN_RQ_PLIS.s2.ipynb b/rq/AN_RQ_PLIS.s2.ipynb
index 5a0516a01febb1212e6bb3c3bf30436b5e479925..a38203da566de8904fec6a3b654136af8ddf8202 100644
--- a/rq/AN_RQ_PLIS.s2.ipynb
+++ b/rq/AN_RQ_PLIS.s2.ipynb
@@ -245,7 +245,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s-%s, %s: %s-%s' % (circuit_names[0], circuit_names[1], hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "i_meas_nxcals_dfs[0].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[0]}, inplace=True)\n",
     "i_meas_nxcals_dfs[1].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[1]}, inplace=True)\n",
diff --git a/rq/AN_RQ_PNO.a6.ipynb b/rq/AN_RQ_PNO.a6.ipynb
index 1471800c3210de6de517deff5d8fd209e8fdd5af..b7d756801111a8856779a2e3215e5b78059b6e05 100644
--- a/rq/AN_RQ_PNO.a6.ipynb
+++ b/rq/AN_RQ_PNO.a6.ipynb
@@ -283,7 +283,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s, %s: %s-%s' % (circuit_name, hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "i_meas_nxcals_dfs[0] = i_meas_nxcals_dfs[0].rename(columns={i_meas_nxcals_dfs[0].columns[0]: '%s:I_MEAS' % (circuit_names[0])})\n",
     "i_meas_nxcals_dfs[1] = i_meas_nxcals_dfs[1].rename(columns={i_meas_nxcals_dfs[1].columns[0]: '%s:I_MEAS' % (circuit_names[1])})\n",
diff --git a/rq/AN_RQ_PNO.b3.ipynb b/rq/AN_RQ_PNO.b3.ipynb
index 5c794f2481a11dbb7a74363800fc2668e44be37f..9ea44ba0df31f622e7f31d47072b1d609c710fe9 100644
--- a/rq/AN_RQ_PNO.b3.ipynb
+++ b/rq/AN_RQ_PNO.b3.ipynb
@@ -386,7 +386,7 @@
     "import matplotlib as mpl\n",
     "mpl.rcParams['savefig.dpi'] = 80\n",
     "mpl.rcParams['figure.dpi'] = 80\n",
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "title = '%s-%s, %s: %s-%s' % (circuit_names[0], circuit_names[1], hwc_test, Time.to_string(t_start).split('.')[0], Time.to_string(t_end).split('.')[0])\n",
     "i_meas_nxcals_dfs[0].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[0]}, inplace=True)\n",
     "i_meas_nxcals_dfs[1].rename(columns={'I_MEAS': '%s:I_MEAS' % circuit_names[1]}, inplace=True)\n",
@@ -515,7 +515,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.plot_i_earth_pc(circuit_names[0], timestamp_fgc_rqd, i_earth_rqd_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqd_df, col_name='Earth Current')"
    ]
@@ -529,7 +529,7 @@
    },
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.plot_i_earth_pc(circuit_names[1], timestamp_fgc_rqf, i_earth_rqf_df)\n",
     "rq_analysis.calculate_max_i_earth_pc(i_earth_rqf_df, col_name='Earth Current')"
    ]
@@ -540,7 +540,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[0], timestamp_fgc_rqd, i_meas_rqd_df, i_meas_rqd_ref_df, i_earth_pcnt_rqd_df, i_earth_pcnt_rqd_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },
@@ -550,7 +550,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%matplotlib notebook\n",
+    "%matplotlib widget\n",
     "rq_analysis.analyze_i_earth_pcnt_pc(circuit_names[1], timestamp_fgc_rqf, i_meas_rqf_df, i_meas_rqf_ref_df, i_earth_pcnt_rqf_df, i_earth_pcnt_rqf_ref_df, xlim=(-250, 200), start_point=-250, offset=2)"
    ]
   },