diff --git a/input.example.toml b/input.example.toml
index 9a4aedee..bffb1d71 100644
--- a/input.example.toml
+++ b/input.example.toml
@@ -260,6 +260,10 @@
   # Stencil coefficients for the field solver [notation as in Blinne+ (2018)]
   #   @note: Standard Yee solver: `delta_i = beta_ij = 0.0`
   [algorithms.fieldsolver]
+    # Enable the fieldsolver
+    #   @type: bool
+    #   @default: true
+    enable = ""
     # delta_x coefficient (for `F_{i +/- 3/2, j, k}`)
     #   @type: float
     #   @default: 0.0
diff --git a/pgens/accretion/accretion.toml b/pgens/accretion/accretion.toml
index 9215da6b..2326c868 100644
--- a/pgens/accretion/accretion.toml
+++ b/pgens/accretion/accretion.toml
@@ -35,10 +35,6 @@
     CFL        = 0.5
     correction = 1.0
 
-  [algorithms.toggles]
-    deposit     = true
-    fieldsolver = true
-
 [particles]
   ppc0           = 4.0
   use_weights    = true
diff --git a/pgens/wald/wald.toml b/pgens/wald/wald.toml
index 7cdff571..b062c9ca 100644
--- a/pgens/wald/wald.toml
+++ b/pgens/wald/wald.toml
@@ -30,9 +30,8 @@
   [algorithms.timestep]
     CFL = 0.5
 
-  [algorithms.toggles]
-    deposit     = false
-    fieldsolver = true
+  [algorithms.deposit]
+    enable = false
 
 [particles]
   ppc0 = 2.0
diff --git a/src/engines/grpic.hpp b/src/engines/grpic.hpp
index 35e544a9..4d9d89d9 100644
--- a/src/engines/grpic.hpp
+++ b/src/engines/grpic.hpp
@@ -94,9 +94,9 @@ namespace ntt {
 
     void step_forward(timer::Timers& timers, domain_t& dom) override {
       const auto fieldsolver_enabled = m_params.template get<bool>(
-        "algorithms.toggles.fieldsolver");
+        "algorithms.fieldsolver.enable");
       const auto deposit_enabled = m_params.template get<bool>(
-        "algorithms.toggles.deposit");
+        "algorithms.deposit.enable");
       const auto clear_interval = m_params.template get<std::size_t>(
         "particles.clear_interval");