diff --git a/src/cheatsheets/Schaltungstheorie.typ b/src/cheatsheets/Schaltungstheorie.typ
index e4c2a47..e66ec2e 100644
--- a/src/cheatsheets/Schaltungstheorie.typ
+++ b/src/cheatsheets/Schaltungstheorie.typ
@@ -178,6 +178,8 @@
     )
   ]
 
+  // 
+
   // Quell Wandlung
   #bgBlock(fill: colorEineTore)[
     #subHeading(fill: colorEineTore)[Ein-Tor]
@@ -1304,7 +1306,7 @@
       ],
       [],
       [
-        $Phi(t) = integral_(-infinity)^(t) u(tau) d tau = \
+        $<Phi(t) = integral_(-infinity)^(t) u(tau) d tau = \
         Phi(0) + integral_(0)^(t) u(tau) d tau$ \
 
         $u(t) = (d Phi)/(d t) dot(Phi(t))$
@@ -1437,14 +1439,15 @@
       columns: (1fr, 2fr, 2fr, 2fr),
       inset: (bottom: 2mm, top: 2mm),
       fill: (x, y) => if calc.rem(y, 2) == 1 { tableFillLow } else { tableFillHigh },
-      [], [*$Y = U/I$*], [*$Z = I/U$*], [*$phi$*],
-      [], [*$Omega$*], [*$S$*], [*rad*],
+      [], [*$Z = U/I$*], [*$Y = I/U$*], [*$phi$*],
+      [], [*$I -> U$*], [*$U -> I$*], [*$phi$*],
+      [], [*$Omega  space (R)$*], [*$S space (G)$*], [*rad*],
       zap.circuit({
         import zap: *
         resistor("R", (0, 0), (0.6, 0), width: 3mm, height: 2mm, fill: none)
       }),
-      $R$,
-      $1/G = R$,
+      $R = 1/G$,
+      $G = 1/R$,
       $0$,
 
       zap.circuit({
@@ -1537,36 +1540,389 @@
   )
 }
 
-#bgBlock(fill: colorAnalyseVerfahren)[
-  #subHeading(fill: colorAnalyseVerfahren)[Knotenpotenzial-Analyse Komponetent]
-  #import mannot: *
 
-  #let ImageHeight = 3.0cm
+#columns(2)[
+  #bgBlock(fill: colorAnalyseVerfahren)[
+    #subHeading(fill: colorAnalyseVerfahren)[Knotenpotenzial-Analyse Komponetent]
+    #import mannot: *
 
-  #table(
-    columns: (1fr, 1fr, 1fr, 1fr),
-    fill: (x, y) => if calc.rem(y, 2) == 0 { tableFillHigh } else { tableFillLow },
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell3-1.png", height: ImageHeight, fit: "contain")),
+    #let ImageHeight = 3.0cm
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell4.png", height: ImageHeight, fit: "contain")),
+    #table(
+      columns: (1fr, 1fr),
+      fill: (x, y) => if calc.rem(y, 2) == 0 { tableFillHigh } else { tableFillLow },
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell3-1.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell5.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell4.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell6.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell5.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell7.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell6.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell8.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell7.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell9.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell8.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell10.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell9.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell1.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell10.png", height: ImageHeight, fit: "contain")),
 
-    align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell2.png", height: ImageHeight, fit: "contain")),
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell1.png", height: ImageHeight, fit: "contain")),
 
-  )
+      align(center, image("../images/schaltungstheorie/knotenpotenzial/schaltKontenPotenziell2.png", height: ImageHeight, fit: "contain")),
+
+    )
+  ]
+
+  #colbreak()
+
+  // Bauelemente
+  #bgBlock(fill: colorEineTore)[
+    #subHeading(fill: colorEineTore)[Bauelemente]
+    #table(
+      columns: (1fr, 1fr, 1fr),
+      stroke: none,
+      align: center,
+      fill: (x, y) => if (calc.rem(y, 2) == 0) { tableFillLow } else { tableFillHigh },
+      table.header([*Zeichen*], [*Gleichung*], [*Abbildung*]),
+
+      // Quellen: //
+      // Spannungs-quelle
+      [
+        Spannungs-quelle
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          vsource(
+            "b1",
+            fill: none,
+            (0, 0),
+            (1.75, 0),
+          )
+        }))
+      ],
+      [
+
+      ],
+      [
+
+      ],
+
+      // Strom-quelle
+      [
+        Strom-quelle
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          isource(
+            "b1",
+            fill: none,
+            (0, 0),
+            (1.75, 0),
+          )
+        }))
+      ],
+      [
+
+      ],
+      [
+
+      ],
+
+      // Wiederstand
+      [
+        Wiederstand
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          resistor(
+            fill: none,
+            "b1",
+            (0, 0),
+            (2, 0),
+          )
+        }))
+      ],
+      align(center+horizon,[
+        $[R] = Omega = V/A \
+          [G] = S = A/V$
+      ]),
+      [
+
+      ],
+
+      // Induktivität
+      [
+        Induktivität
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          inductor(
+            "b1",
+            (0, 0),
+            (2, 0),
+            variant: "ieee",
+          )
+        }))
+      ],
+      [
+
+      ],
+      [
+
+      ],
+
+      // Kapazität
+      [
+        Kapazität
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          capacitor(
+            fill: none,
+            "b1",
+            (0, 0),
+            (2, 0),
+          )
+        }))
+      ],
+      [
+
+      ],
+      [
+
+      ],
+
+      // Kurzschluss
+      [
+        Kurzschluss (KS)
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          wire((1,0), (-1,0), i: (content: $i_"ll"$, invert: true, anchor: "south"))
+
+          set-style(mark: (end: ("straight")))
+          line((-0.5,0.2), (0.5, 0.2), stroke: (thickness: 0.02))
+          content((0,0.555), $u_"ll" = 0$)
+
+        }))
+      ],
+      align(center+horizon, [
+        $u_"ll" = 0 unit("V")\
+          i_"ll" = "bel."
+        $
+      ]),
+      [
+
+      ],
+
+      // Leerlauf
+      [
+        Leerlauf (LL)
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          node("N0",(-0.5,0))
+          node("N1",(0.5,0))
+          wire((-1,0), "N0")
+          wire((1,0), "N1", i: (content: $i_"ll" = 0$, invert: true, anchor: "south"))
+
+          set-style(mark: (end: ("straight")))
+          line((-0.3,0), (0.3, 0), stroke: (thickness: 0.02))
+          content((0,0.35), $u_"ll"$)
+
+        }))
+      ],
+      align(center+horizon, [
+        $u_"ll" = "bel."\
+          i_"ll" = 0 unit("A")
+        $
+      ]),
+      [
+
+      ],
+
+      // Nullator
+      [
+        Nullator
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          joham.nullator("N0", (-1,0), (1,0), scale: 0.5, i: (anchor: "south", content: $i_"null"$))
+        
+          set-style(mark: (end: ("straight")))
+          line((-0.3,0.3), (0.3, 0.3), stroke: (thickness: 0.02))
+          content((0,0.6), $u_"null"$)
+        }))
+      ],
+      align(center+horizon, [
+        $u_"null" = 0 unit("V")\
+          i_"ll" = 0 unit("A")
+        $
+      ]),
+      [
+
+      ],
+
+      // Norator
+      [
+        Norator
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          joham.norator("N0", (-1,0), (1,0), scale: 0.5, i: (anchor: "south", content: $i_"nor"$))
+        
+          set-style(mark: (end: ("straight")))
+          line((-0.3,0.3), (0.3, 0.3), stroke: (thickness: 0.02))
+          content((0,0.6), $u_"nor"$)
+        }))
+      ],
+      align(center+horizon, [
+        $u_"null" = "bel."\
+          i_"ll" = "bel."
+        $
+      ]),
+      [
+
+      ],
+
+      // Dioden ://
+      //
+      // ideale Diode
+      [
+        ideale Diode
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          diode("b1", (0, 0), (1., 0), stroke: black, fill: white)
+        }))
+      ],
+      [
+        $u=0$ falls $i>0$
+        $i=0$ falls $u<0$
+      ],
+      [
+        /*
+        #scale(x: 50%, y: 50%,
+          cetz.canvas({
+            import cetz.draw: *
+              line((-1.5, 0), (1.5, 0), mark: (end: "straight"))
+              line((0, -1.5), (0, 1.5), mark: (end: "straight"))
+
+              content( (1.55, 0), $u$, anchor: "west")
+              content( (0.15, 1.4), $i$, anchor: "west")
+
+              line((-1.5, 0), (0, 0), stroke: red)      // u = 0
+              line((0, 0), (0, 1.35), stroke: red)      // i = 0
+
+        }))
+        */
+        #scale(x: 75%, y: 75%, cetz.canvas({
+          import cetz.draw: *
+          import cetz-plot: *
+
+          let opts = (x-tick-step: none, y-tick-step: none, size: (2, 1), x-label: [u], y-label: [i])
+
+          plot.plot(axis-style: "school-book", ..opts, name: "plot", {
+            plot.add(((-1, 0), (0, 0)), style: (stroke: red))
+            plot.add(((0, 0), (0, 1)), style: (stroke: red))
+          })
+        }))
+      ],
+      //table.hline(start: 1, end: 2),
+
+      // reale/pn Diode
+      [
+        reale/pn Diode
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          diode("b1", (0, 0), (1., 0), stroke: black, fill: black)
+        }))
+      ],
+
+      [
+        $u_D = u_T*ln((i_D/I_S)+1)$
+        $i_D = I_S*(e^(u_D/U_T)-1)$
+      ],
+      [
+        #scale(x: 75%, y: 75%, cetz.canvas({
+          import cetz.draw: *
+          import cetz-plot: *
+
+          let opts = (x-tick-step: none, y-tick-step: none, size: (2, 1), x-label: [u], y-label: [i])
+          let data = plot.add(x => calc.exp(x) - 1, domain: (-2, 2), style: (stroke: red))
+
+          plot.plot(axis-style: "school-book", ..opts, data, name: "plot")
+        }))
+      ],
+
+      // Photodiode
+      [
+        Photodiode
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          photodiode("b1", (0, 0), (1., 0), stroke: black, fill: black)
+        }))
+      ],
+      [
+        $i = I_S*(e^(u_D/U_T)-1)- i_L$
+      ],
+      [
+        #scale(x: 75%, y: 75%, cetz.canvas({
+          import cetz.draw: *
+          import cetz-plot: *
+
+          let opts = (x-tick-step: none, y-tick-step: none, size: (2, 1), x-label: [u], y-label: [i])
+
+          plot.plot(axis-style: "school-book", ..opts, name: "plot", {
+            plot.add(x => calc.exp(x) - 1, domain: (-2, 2), style: (stroke: red))
+
+            plot.add(x => calc.exp(x) - 2, domain: (-2, 2), style: (stroke: red))
+
+            plot.add(x => calc.exp(x) - 3, domain: (-2, 2), style: (stroke: red))
+          })
+        }))
+      ],
+
+      // Zenerdiode
+      [
+        Zenerdiode
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          zener("b1", (0, 0), (1., 0), stroke: black, fill: black)
+        }))
+      ],
+      [
+        Durchbruch bei $u=U_Z$ :
+        $u<=U_Z$ stark leitend
+      ],
+      [
+
+      ],
+
+      // Tunneldiode
+      [
+        Tunneldiode
+        #scale(x: 100%, y: 100%, zap.circuit({
+          import zap: *
+          import cetz.draw: content, line
+          tunnel("b1", (0, 0), (1., 0), stroke: black, fill: black)
+        }))
+      ],
+      [
+
+      ],
+      [
+
+      ],
+
+    );
+
+
+  ]
 ]
 
 #bgBlock(fill: colorZweiTore, width: 100%)[