circuitikz (10may19)

git-svn-id: svn://tug.org/texlive/trunk@51071 c570f23f-e606-0410-a88d-b1316a301751

23 files changed, 15731 insertions, 9046 deletions

diff --git a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
index a75281218d7..af1d7cd4415 100644
--- a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
+++ b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
diff --git a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
index 5e82d6dad28..5160dc4bb6b 100644
--- a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
+++ b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
@@ -1,6 +1,32 @@
 <!--- CircuiTikz - Changelog --->
 The major changes among the different circuitikz versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes.
 
+* Version 0.9.0 (2019-05-10)
+    - Added Romano Giannetti as contributor
+    - Added a CONTRIBUTING file
+    - Added options for solving the voltage direction problems. 
+	- Adjusted ground symbols to better match ISO standard, added new symbols
+    - Added new sources (cute european versions, noise sources) 
+    - Added new types of amplifiers, and option to flip inputs and outputs
+    - Added bidirectional diodes (diac) thanks to Andre Lucas Chinazzo 
+    - Added L,R,C sensors (with european, american and cute variants)
+    - Added stacked labels (thanks to the original work by Claudio Fiandrino)
+    - Make the position of voltage symbols adjustable
+    - Make the position of arrows in FETs and  BJTs adjustable
+    - Added chips (DIP, QFP) with a generic number of pins 
+    - Added special anchors for transformers (and fixed the wrong center anchor)
+    - Changed the logical port implementation to multiple inputs (thanks to John Kormylo) with border anchors.
+    - Added several symbols: bulb, new switches, new antennas, loudspeaker, microphone, coaxial connector, viscoelastic element
+    - Make most components fillable
+    - Added the oscilloscope component and several new instruments
+    - Added viscoelastic element
+    - Added a manual section on how to define new components
+    - Fixed american voltage symbols and allow to customize them
+	- Fixed placement of straightlabels in several cases
+    - Fixed a bug about straightlabels (thanks to @fotesan)
+    - Fixed labels spacing so that they are independent on scale factor
+    - Fixed the position of text labels in amplifiers
+  
 * Version 0.8.3 (2017-05-28) 
 	- Removed unwanted lines at to-paths if the starting point is a node without a explicit anchor.
 	- Fixed scaling option, now all parts are scaled by bipoles/length
diff --git a/Master/texmf-dist/doc/generic/circuitikz/README.md b/Master/texmf-dist/doc/generic/circuitikz/README.md
index 60f87f0d0f1..6fcacd5369d 100644
--- a/Master/texmf-dist/doc/generic/circuitikz/README.md
+++ b/Master/texmf-dist/doc/generic/circuitikz/README.md
@@ -43,9 +43,10 @@ More Information can be found in the manual and at the wiki of the project locat
 * Massimo Redaelli (m.redaelli@gmail.com)
 * Stefan Lindner (stefan.lindner@fau.de)
 * Stefan Erhardt (stefan.erhardt@fau.de)
+* Romano Giannetti (romano@rgtti.com)
 
 -------------
-Copyright 2007-16 by Massimo Redaelli
+Copyright 2007-18 by Massimo Redaelli
 
 This file may be distributed and/or modified
 
diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
index 2273d50bbd5..03932fa52a8 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
@@ -6,6 +6,65 @@ full list of changes.
 \begin{itemize}
 \tightlist
 \item
+  Version 0.9.0 (2019-05-10)
+
+  \begin{itemize}
+  \tightlist
+  \item
+    Added Romano Giannetti as contributor
+  \item
+    Added a CONTRIBUTING file
+  \item
+    Added options for solving the voltage direction problems.
+  \item
+    Adjusted ground symbols to better match ISO standard, added new
+    symbols
+  \item
+    Added new sources (cute european versions, noise sources)
+  \item
+    Added new types of amplifiers, and option to flip inputs and outputs
+  \item
+    Added bidirectional diodes (diac) thanks to Andre Lucas Chinazzo
+  \item
+    Added L,R,C sensors (with european, american and cute variants)
+  \item
+    Added stacked labels (thanks to the original work by Claudio
+    Fiandrino)
+  \item
+    Make the position of voltage symbols adjustable
+  \item
+    Make the position of arrows in FETs and BJTs adjustable
+  \item
+    Added chips (DIP, QFP) with a generic number of pins
+  \item
+    Added special anchors for transformers (and fixed the wrong center
+    anchor)
+  \item
+    Changed the logical port implementation to multiple inputs (thanks
+    to John Kormylo) with border anchors.
+  \item
+    Added several symbols: bulb, new switches, new antennas,
+    loudspeaker, microphone, coaxial connector, viscoelastic element
+  \item
+    Make most components fillable
+  \item
+    Added the oscilloscope component and several new instruments
+  \item
+    Added viscoelastic element
+  \item
+    Added a manual section on how to define new components
+  \item
+    Fixed american voltage symbols and allow to customize them
+  \item
+    Fixed placement of straightlabels in several cases
+  \item
+    Fixed a bug about straightlabels (thanks to @fotesan)
+  \item
+    Fixed labels spacing so that they are independent on scale factor
+  \item
+    Fixed the position of text labels in amplifiers
+  \end{itemize}
+\item
   Version 0.8.3 (2017-05-28)
 
   \begin{itemize}
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
index af84864d70b..9b9b163278d 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
index 35c383523ae..bbbfec74028 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
@@ -5,17 +5,20 @@
 % !TeX spellcheck = en_US
 % !TeX encoding = utf8
 
-\documentclass[a4paper]{article}
+\documentclass[a4paper, titlepage]{article}
 \usepackage{a4wide}	%smaller borders
-
+\usepackage{titling}
 
 \def\modern{
 	\usepackage{fontspec}
 	\defaultfontfeatures{Ligatures=TeX, Numbers=OldStyle,Mapping=tex-text ,SmallCapsFeatures={LetterSpace=8, Numbers=OldStyle}}
-	%\setmainfont{Gentium Book Basic} 
+	%\setmainfont{Gentium Book Basic}
 }
 
-\usepackage[siunitx]{circuitikz}
+%do not split this line in more lines, otherwise "make git-manual" will show the wrong version
+\usepackage[siunitx, RPvoltages]{circuitikz}
+% Let this being the same as the chosen voltage direction for coherence
+\def\chosenvoltoption{RPvoltages}
 
 \usepackage{ifxetex,ifluatex}
 \ifxetex
@@ -35,7 +38,18 @@
 
 \sisetup{load=derived} % loading \siemens
 \usepackage{showexpl}
-\lstset{pos=l,width=-99pt, overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe=single,numbers=left,numberstyle=\tiny,numbersep=.3em, xleftmargin=1em, columns=flexible, language=[LaTeX]TEX,breaklines=true,basicstyle=\normalsize\ttfamily,tabsize=3}
+%
+% The following trick is used to silence showexpl a bit, so that the
+% logs are readable...
+%
+\makeatletter
+\let\SX@Info=\relax % silence showexpl a bit...
+\makeatother
+%
+\lstset{pos=l,width=-99pt, overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,
+    rframe=single,numbers=left,numberstyle=\tiny,numbersep=.3em, xleftmargin=1em,
+    columns=flexible, language=[LaTeX]TEX,breaklines=true,
+    basicstyle=\normalsize\ttfamily,tabsize=3}
 
 \usepackage{booktabs}
 \renewcommand{\arraystretch}{1.2}
@@ -45,7 +59,7 @@
 \hypersetup{
     bookmarks=false,         % show bookmarks bar?
     pdftitle={CircuiTikZ \pgfcircversion\ - manual},    % title
-    pdfauthor={Massimo Redaelli, Stefan Lindner, Stefan Erhardt},     % author
+    pdfauthor={Massimo Redaelli, Stefan Lindner, Stefan Erhardt, Romano Giannetti},     % author
     pdfsubject={CircuiTikZ manual},   % subject of the document
     pdfkeywords={}, % list of keywords
     colorlinks=true,       % false: boxed links; true: colored links
@@ -58,26 +72,22 @@
 \usepackage{textcomp}
 \makeindex[title=Index of the components, intoc=true]
 
-\def\circuititem#1#2#3{\item {#2} (node[\texttt{#1}]\{#3\}) \index{#1} \par \begin{center}\begin{circuitikz} \draw (0,0) node[#1] {#3}; \end{circuitikz} \end{center}
-\par}
-
-\newcommand{\circuititembip}[3]{\item {#2} \index{#1}
-\tikz\foreach \i in {#3} {\index{\i|see{#1}} }; (\texttt{#1}%
-\ifthenelse{\equal{#3}{}}{%
-}{%
-, or \texttt{#3}%
-}%
-)\par \begin{center}\begin{circuitikz} \draw (0,0) to[#1] (2,0); \end{circuitikz} \end{center}\par}
+% Local utilities packages
+\usepackage{ctikzmanutils}
 
-%\usepackage{marvosym}
-%\newcommand{\email}[2][]{\def\temp{#1}\ifx\temp\empty\Letter~\fi\href{mailto:#2}{#2}}
 \newcommand{\email}[1]{\href{mailto:#1}{#1}}
-
 \long\def\comment#1{}
 
+% There are a lot of boxes in the document; let's try to give TeX
+% a bit of leverage... do not use parindent (which looks strange between examples)
+% and add stretch between paragraph, to avoid a lot of sections and subsections
+% starting at the end of the page.
+\parindent=0pt
+\parskip=4pt plus 6pt minus 2pt
+
 \begin{document}
-\setcounter{secnumdepth}{3}
-\setcounter{tocdepth}{3} 
+\setcounter{secnumdepth}{4}
+\setcounter{tocdepth}{4}
 
 \def\TikZ{Ti\emph{k}Z}
 \def\Circuitikz{Circui\TikZ}
@@ -86,9 +96,42 @@
 \lstloadlanguages{TeX}
 
 \title{\Circuitikz \\{\large version \pgfcircversion{} (\pgfcircversiondate)}}
-\author{Massimo A. Redaelli (\email{m.redaelli@gmail.com})\\Stefan Lindner (\email{stefan.lindner@fau.de})\\Stefan Erhardt (\email{stefan.erhardt@fau.de})}
+\author{Massimo A. Redaelli (\email{m.redaelli@gmail.com})\\
+    Stefan Lindner (\email{stefan.lindner@fau.de})\\
+    Stefan Erhardt (\email{stefan.erhardt@fau.de})\\
+    Romano Giannetti (\email{romano.giannetti@gmail.com})}
 \date{\today}
 
+\pretitle{\begin{center}%
+    \begin{circuitikz}
+        \draw (0,0) node[dipchip, rotate=90, num pins=40, fill=cyan!20!white](C){%
+            \rotatebox{-90}{\LARGE\Circuitikz}%
+        };
+        \draw (C.pin 20) -- ++(0,-8) node[ground](GND){};
+        \draw (C.pin 7) to[D, fill=blue] ++(0,-1) -- ++(0.5,0) to[R] ++(2,0)
+            coordinate(a1) to[short, -*]
+            node[above left, blue]{Massimo A. Redaelli}
+            node[below left,]{\email{m.redaelli@gmail.com}}
+            (a1-|GND);
+            \draw (C.pin 5) to[D, fill=red] ++(0,-3)-- ++(0.5,0) to[R] ++(2,0)
+            coordinate(a2) to[short, -*]
+            node[above left, blue]{Stefan Lindner}
+            node[below left,]{\email{stefan.lindner@fau.de}}
+            (a2-|GND);
+            \draw (C.pin 3) to[D, fill=green] ++(0,-5)-- ++(0.5,0) to[R] ++(2,0)
+            coordinate(a3) to[short, -*]
+            node[above left, blue]{Stefan Erhart}
+            node[below left,]{\email{stefan.erhardt@fau.de}}
+            (a3-|GND);
+            \draw (C.pin 1) to[D, fill=yellow] ++(0,-7)-- ++(0.5,0) to[R] ++(2,0)
+            coordinate(a4) to[short, -*]
+            node[above left, blue]{Romano Giannetti}
+            node[below left,]{\email{romano.giannetti@gmail.com}}
+            (a4-|GND);
+    \end{circuitikz}
+    \par\bigskip\vfill}
+\posttitle{\end{center}}
+
 \maketitle
 
 \tableofcontents
@@ -96,20 +139,16 @@
 \section{Introduction}
 \subsection{About}
 \Circuitikz\ was initiated by Massimo Redaelli in 2007, who was working as a research assistant at the Polytechnic University of Milan, Italy, and needed a tool for creating exercises and exams.
-After he left University in 2010 the development of \Circuitikz\ slowed down, since \LaTeX\ is mainly established in the academic world. In 2015 Stefan Lindner and Stefan Erhardt, both working as research assistants at the University of Erlangen-Nürnberg, Germany, joined the team and now maintain the project together with the initial author.
+After he left University in 2010 the development of \Circuitikz\ slowed down, since \LaTeX\ is mainly established in the academic world. In 2015 Stefan Lindner and Stefan Erhardt, both working as research assistants at the University of Erlangen-Nürnberg, Germany, joined the team and now maintain the project together with the initial author. In 2018 Romano Giannetti, full professor of Electronics at Comillas Pontifical University of Madrid, joined the team.
 
 The use of \Circuitikz\ is, of course, not limited to academic teaching. The package gets widely used by engineers for typesetting electronic circuits for articles and publications all over the world.
 
-\medskip
-
-This documentation is somewhat scant. Hopefully the authors will find the leisure to improve it some day.
-
 \subsection{Loading the package}
 
 \begin{table}[h]
 \centering
 \begin{tabular}{ll}\toprule
-	\LaTeX       					& \ConTeXt\footnotemark \\ \midrule
+	\LaTeX       	& \ConTeXt\footnotemark \\ \midrule
 	\verb!\usepackage{circuitikz}!	& \verb!\usemodule[circuitikz]!\\
 	\bottomrule
 \end{tabular}
@@ -124,11 +163,25 @@ This documentation is somewhat scant. Hopefully the authors will find the leisur
 \tikz \draw (0,0) to[R=$R_1$] (2,0);
 \end{LTXexample}
 
+\subsection{Installing a new version of the package.}
+
+The stable version of the package should come with your \LaTeX\ distribution. Downloading the files from CTAN and installing them locally is, unfortunately, a distribution-dependent task and sometime not so trivial. If you search for \texttt{local texmf tree} and the name of your distribution on \url{https://tex.stackexchange.com/} you will find a lot of hints.
+
+Anyway, the easiest way of using whichever version of \Circuitikz\ is to point to the github page \url{https://circuitikz.github.io/circuitikz/} of the project, and download the version you want. You will download a simple (biggish) file, called \texttt{circuitikz.sty}.
+
+Now you can just put this file in your local \texttt{texmf} tree, if you have one, or simply adding it into the same directory where your main file resides, and then use
+
+\begin{verbatim}
+    \usepackage[...options...]{circuitikzgit}
+\end{verbatim}
+
+instead of \texttt{circuitikz}. This is also advantageous for ``future resilience''; the authors try hard not to break backward compatibility with new versions, but sometime things happen.
+
 \subsection{Requirements}
 \begin{itemize}
- \item \texttt{tikz}, version $\ge 3$;
- \item \texttt{xstring}, not older than 2009/03/13;
- \item \texttt{siunitx}, if using \texttt{siunitx} option.
+    \item \texttt{tikz}, version $\ge 3$;
+    \item \texttt{xstring}, not older than 2009/03/13;
+    \item \texttt{siunitx}, if using \texttt{siunitx} option.
 \end{itemize}
 
 \subsection{Incompatible packages}
@@ -137,116 +190,561 @@ This documentation is somewhat scant. Hopefully the authors will find the leisur
 So, if loaded with said option, one must write \verb!(0,0) to[*R] (2,0)! and, for transistors on a path, \verb!(0,0) to[*Tnmos] (2,0)!, and so on (but \verb!(0,0) node[nmos] {}!). See example at page~\pageref{ex:compatibility}.
 
 \subsection{License}
-Copyright \copyright\ 2007--2017 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘as is’, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
+Copyright \copyright\ 2007--2019 Massimo Redaelli. This package is author-maintained. Permission is granted to copy, distribute and/or modify this software under the terms of the \LaTeX\ Project Public License, version 1.3.1, or the GNU Public License. This software is provided ‘as is’, without warranty of any kind, either expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose.
 
 \subsection{Feedback}
 The easiest way to contact the authors is via the official Github repository: \url{https://github.com/circuitikz/circuitikz/issues}
 
 
-\section{Incompabilities between version}
+\subsection{Incompabilities between version}
 Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers.
 You can check the used version at your local installation using the macro \verb!\pgfcircversion{}!.
 \begin{itemize}
-\item Since v0.8.2: voltage and current label directions(v<= / i<=) do NOT change the orientation of the drawn source shape anymore. Use the "invert" option to rotate the shape of the source. Furthermore, from this version on, the current label(i=) at current sources can be used independent of the regular label(l=).
-\item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions.
-\item Since v0.5.1: The parts pfet,pigfete,pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this.
-\item Since v0.5: New voltage counting direction, here exists an option to use the old behaviour
+    \item After v0.9.0: the parameters \texttt{tripoles/american or port/aaa}, \texttt{...bbb}, \texttt{...ccc} and \texttt{...ddd} are no longer used and are silently ignored; the same stands for \texttt{nor}, \texttt{xor}, and \texttt{xnor} ports.
+    \item After v0.9.0: voltage and current directions/sign (plus and minus signs in case of \texttt{american voltages} and arrows in case of \texttt{european voltages} have been rationalized with a couple of new options (see details in section~\ref{curr-and-volt}. The default case is still the same as v0.8.3.
+    \item Since v0.8.2: voltage and current label directions(v<= / i<=) do NOT change the orientation of the drawn source shape anymore. Use the "invert" option to rotate the shape of the source. Furthermore, from this version on, the current label(i=) at current sources can be used independent of the regular label(l=).
+    \item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions.
+    \item Since v0.5.1: The parts pfet, pigfete, pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this.
+    \item Since v0.5: New voltage counting direction, here exists an option to use the old behaviour
 \end{itemize}
 For older projects, you can use an older version locally using the git-version and picking the correct commit from the repository (branch gh-pages).
 
-\section{Package options}
+\subsection{Package options}
+\label{sec:package-options}
 
 \noindent Circuit people are very opinionated about their symbols. In order to meet the individual gusto you can set a bunch of package options. The standard options are what the authors like, for example you get this:
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz}
-	\draw (0,0) to[R=2<\ohm>, i=?, v=84<\volt>] (2,0) -- 
-		(2,2) to[V<=84<\volt>] (0,2) 
-		-- (0,0);
-\end{circuitikz}
+    \begin{circuitikz}
+        \draw (0,0) to[R=2<\ohm>, i=?, v=84<\volt>] (2,0) --
+        (2,2) to[V<=84<\volt>] (0,2)
+        -- (0,0);
+    \end{circuitikz}
 \end{LTXexample}
 
 Feel free to load the package with your own cultural options:
 
 \begin{center}
-\begin{tabular}{ll}\toprule
-	\LaTeX       					& \ConTeXt \\ \midrule
-	\verb!\usepackage[american]{circuitikz}!	& \verb!\usemodule[circuitikz][american]!\\
-	\bottomrule
-\end{tabular}
+    \begin{tabular}{ll}\toprule
+        \LaTeX       					& \ConTeXt \\ \midrule
+        \verb!\usepackage[american]{circuitikz}!	& \verb!\usemodule[circuitikz][american]!\\
+        \bottomrule
+    \end{tabular}
 \end{center}
 
 \begin{LTXexample}[varwidth=true,linerange={1-1,3-6}]
-\begin{circuitikz}
-	[circuitikz/voltage=american, circuitikz/resistor=american] % line not printed
-	\draw (0,0) to[R=2<\ohm>, i=?, v=84<\volt>] (2,0) -- 
-		(2,2) to[V<=84<\volt>] (0,2) 
-		-- (0,0);
-\end{circuitikz}
+    \begin{circuitikz}
+        [circuitikz/voltage=american, circuitikz/resistor=american] % line not printed
+        \draw (0,0) to[R=2<\ohm>, i=?, v=84<\volt>] (2,0) --
+        (2,2) to[V<=84<\volt>] (0,2)
+        -- (0,0);
+    \end{circuitikz}
 \end{LTXexample}
 
 \medskip{}
 
 \noindent Here is the list of all the options:
-\begin{itemize}
-	\item \texttt{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources;
-	\item \texttt{straightvoltages}: uses arrows to define voltages, and and uses straight voltage arrows;
-	\item \texttt{americanvoltages}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources;
-	\item \texttt{europeancurrents}: uses european-style current sources;
-	\item \texttt{americancurrents}: uses american-style current sources;
-	\item \texttt{europeanresistors}: uses rectangular empty shape for resistors, as per european standards;
-	\item \texttt{americanresistors}: uses zig-zag shape for resistors, as per american standards;
-	\item \texttt{europeaninductors}: uses rectangular filled shape for inductors, as per european standards;
-	\item \texttt{americaninductors}: uses "4-bumps" shape for inductors, as per american standards;
-	\item \texttt{cuteinductors}: uses my personal favorite, "pig-tailed" shape for inductors;
-	\item \texttt{americanports}: uses triangular logic ports, as per american standards;
-	\item \texttt{europeanports}: uses rectangular logic ports, as per european standards;
-	\item \texttt{americangfsurgearrester}: uses round gas filled surge arresters, as per american standards;
-	\item \texttt{europeangfsurgearrester}: uses rectangular gas filled surge arresters, as per european standards;
-	\item \texttt{european}: equivalent to \texttt{europeancurrents}, \texttt{europeanvoltages}, \texttt{europeanresistors}, \texttt{europeaninductors}, \texttt{europeanports}, \texttt{europeangfsurgearrester};
-	\item \texttt{american}: equivalent to \texttt{americancurrents}, \texttt{americanvoltages}, \texttt{americanresistors}, \texttt{americaninductors}, \texttt{americanports}, \texttt{americangfsurgearrester};
-	\item \texttt{siunitx}: integrates with \texttt{SIunitx} package. If labels, currents or voltages are of the form \verb!#1<#2>! then what is shown is actually \verb!\SI{#1}{#2}!; 
-	\item \texttt{nosiunitx}: labels are not interpreted as above;
-	\item \texttt{fulldiode}: the various diodes are drawn \emph{and} filled by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D-},  \ldots
-	\item \texttt{strokediode}: the various diodes are drawn \emph{and} stroke by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D*},  \ldots
-	\item \texttt{emptydiode}: the various diodes are drawn \emph{but not} filled by default, i.e. when using styles such as \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D-},  \ldots
-	\item \texttt{arrowmos}: pmos and nmos have arrows analogous to those of pnp and npn transistors;
-	\item \texttt{noarrowmos}: pmos and nmos do not have arrows analogous to those of pnp and npn transistors;
-	\item \texttt{fetbodydiode}: draw the body diode of a FET;
-	\item \texttt{nofetbodydiode}: do not draw the body diode of a FET;
-	\item \texttt{fetsolderdot}: draw solderdot at bulk-source junction of some transistors;
-	\item \texttt{nofetsolderdot}: do not draw solderdot at bulk-source junction of some transistors;
-	\item \texttt{emptypmoscircle}: the circle at the gate of a pmos transistor gets not filled;
-	\item \texttt{lazymos}: draws lazy nmos and pmos transistors. Chip designers with huge circuits prefer this notation;
-	\item \texttt{straightlabels}: labels on bipoles are always printed straight up, i.e.~with horizontal baseline;
-	\item \texttt{rotatelabels}: labels on bipoles are always printed aligned along the bipole;
-	\item \texttt{smartlabels}: labels on bipoles are rotated along the bipoles, unless the rotation is very close to multiples of 90°;
-	\item \texttt{compatibility}: makes it possibile to load \Circuitikz\ and \TikZ\ circuit library together.
-	\item \texttt{oldvoltagedirection}: Use old(erronous) way of voltage direction having a difference between european and american direction
-	\item \texttt{betterproportions}\footnote{May change in the future!}: nicer proportions of transistors in comparision to resistors;
-\end{itemize}	
-
-The old options in the singular (like \texttt{american voltage}) are still available for compatibility, but are discouraged.
-
-\medskip
-
-Loading the package with no options is equivalent to my own personal liking, that is to the following options:\\
- \texttt{[nofetsolderdot,nooldvoltagedirection,europeancurrents,europeanvoltages,americanports,americanresistors,cuteinductors,europeangfsurgearrester,nosiunitx,noarrowmos,smartlabels,nocompatibility]}.
- 
-\medskip
-
-In \ConTeXt\ the options are similarly specified: \texttt{current=european|american}, \texttt{voltage=european|american},  \texttt{resistor=american|european},  \texttt{inductor=cute|american|european}, \texttt{logic=american|european}, \texttt{siunitx=true|false}, \texttt{arrowmos=false|true}.
- 
+{\sloppy % for the big lists of \texttt here
+    \begin{itemize}
+        \item \texttt{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources;
+        \item \texttt{straightvoltages}: uses arrows to define voltages, and and uses straight voltage arrows;
+        \item \texttt{americanvoltages}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources;
+        \item \texttt{europeancurrents}: uses european-style current sources;
+        \item \texttt{americancurrents}: uses american-style current sources;
+        \item \texttt{europeanresistors}: uses rectangular empty shape for resistors, as per european standards;
+        \item \texttt{americanresistors}: uses zig-zag shape for resistors, as per american standards;
+        \item \texttt{europeaninductors}: uses rectangular filled shape for inductors, as per european standards;
+        \item \texttt{americaninductors}: uses "4-bumps" shape for inductors, as per american standards;
+        \item \texttt{cuteinductors}: uses my personal favorite, "pig-tailed" shape for inductors;
+        \item \texttt{americanports}: uses triangular logic ports, as per american standards;
+        \item \texttt{europeanports}: uses rectangular logic ports, as per european standards;
+        \item \texttt{americangfsurgearrester}: uses round gas filled surge arresters, as per american standards;
+        \item \texttt{europeangfsurgearrester}: uses rectangular gas filled surge arresters, as per european standards;
+        \item \texttt{european}: equivalent to \texttt{europeancurrents}, \texttt{europeanvoltages}, \texttt{europeanresistors}, \texttt{europeaninductors}, \texttt{europeanports}, \texttt{europeangfsurgearrester};
+        \item \texttt{american}: equivalent to \texttt{americancurrents}, \texttt{americanvoltages}, \texttt{americanresistors}, \texttt{americaninductors}, \texttt{americanports}, \texttt{americangfsurgearrester};
+        \item \texttt{siunitx}: integrates with \texttt{SIunitx} package. If labels, currents or voltages are of the form \verb!#1<#2>! then what is shown is actually \verb!\SI{#1}{#2}!;
+        \item \texttt{nosiunitx}: labels are not interpreted as above;
+        \item \texttt{fulldiode}: the various diodes are drawn \emph{and} filled by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D-},  \ldots
+        \item \texttt{strokediode}: the various diodes are drawn \emph{and} stroke by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D*},  \ldots
+        \item \texttt{emptydiode}: the various diodes are drawn \emph{but not} filled by default, i.e. when using styles such as \texttt{D}, \texttt{sD}, \ldots Other diode styles can always be forced with e.g. \texttt{Do}, \texttt{D-},  \ldots
+        \item \texttt{arrowmos}: pmos and nmos have arrows analogous to those of pnp and npn transistors;
+        \item \texttt{noarrowmos}: pmos and nmos do not have arrows analogous to those of pnp and npn transistors;
+        \item \texttt{fetbodydiode}: draw the body diode of a FET;
+        \item \texttt{nofetbodydiode}: do not draw the body diode of a FET;
+        \item \texttt{fetsolderdot}: draw solderdot at bulk-source junction of some transistors;
+        \item \texttt{nofetsolderdot}: do not draw solderdot at bulk-source junction of some transistors;
+        \item \texttt{emptypmoscircle}: the circle at the gate of a pmos transistor gets not filled;
+        \item \texttt{lazymos}: draws lazy nmos and pmos transistors. Chip designers with huge circuits prefer this notation;
+        \item \texttt{straightlabels}: labels on bipoles are always printed straight up, i.e.~with horizontal baseline;
+        \item \texttt{rotatelabels}: labels on bipoles are always printed aligned along the bipole;
+        \item \texttt{smartlabels}: labels on bipoles are rotated along the bipoles, unless the rotation is very close to multiples of 90°;
+        \item \texttt{compatibility}: makes it possibile to load \Circuitikz\ and \TikZ\ circuit library together.
+        \item Voltage directions: until v0.8.3, there was an error in the coherence between american and european voltages styles (see section~\ref{curr-and-volt} for the batteries. This has been fixed, but to guarantee backward compatibility and nasty surprises, the fix is available with new options:
+            \begin{itemize}
+                \item \texttt{oldvoltagedirection}: Use old way of voltage direction having a difference between european and american direction, with wrong default labelling for batteries;
+                \item \texttt{nooldvoltagedirection}: The standard from 0.5 onward, utilize the (German?) standard of voltage arrows in the  direction of electric fields (without fixing batteries);
+                \item \texttt{RPvoltages} (meaning Rising Potential voltages): the arrow is in direction of rising potential, like in \texttt{oldvoltagedirections}, but batteries and current sources are fixed to follow the passive/active standard;
+                \item \texttt{EFvoltages} (meaning Electric Field voltages): the arrow is in direction of the electric field, like in \texttt{nooldvoltagedirections}, but batteries are fixed;
+            \end{itemize}
+            If none of these option are given, the package will default to \texttt{nooldvoltagedirections}, but will give a warning. The behavior is also selectable circuit by circuit with the \texttt{voltage dir} style.
+        \item \texttt{betterproportions}\footnote{May change in the future!}: nicer proportions of transistors in comparision to resistors;
+    \end{itemize}
+
+
+    The old options in the singular (like \texttt{american voltage}) are still available for compatibility, but are discouraged.
+
+    \medskip
+
+    Loading the package with no options is equivalent to the following options:
+    \texttt{[nofetsolderdot, europeancurrents, europeanvoltages, americanports,
+        americanresistors, cuteinductors, europeangfsurgearrester, nosiunitx, noarrowmos,
+    smartlabels, nocompatibility]}.
+
+    \medskip
+
+    In \ConTeXt\ the options are similarly specified: \texttt{current= european|american}, \texttt{voltage= european|american},  \texttt{resistor= american|european},  \texttt{inductor= cute|american|european}, \texttt{logic= american|european}, \texttt{siunitx= true|false}, \texttt{arrowmos= false|true}.
+
+} %\stop the \sloppy processing
+
+\section{Tutorials}
+
+To draw a circuit, you have to load the \texttt{circuitikz} package; this can be done with
+\begin{lstlisting}
+    \usepackage[siunitx, RPvoltages]{circuitikz}
+\end{lstlisting}
+somewhere in your document preamble. It will load automatically the needed packages if not already done before.
+
+\subsection{Getting started with \Circuitikz: a current shunt}
+
+Let's say we want to prepare a circuit to teach how a current shunt works; the idea is just draw a current generator, a couple of resistors in parallel, and the indication of currents and voltages for the discussion.
+
+A circuit in \Circuitikz is drawn into a \texttt{circuitikz} environment (which is really an alias for a \texttt{tikzpicture} one). In this first example we will use absolute coordinates.
+The electrical components can be divided in two big categories: the one that are bipoles and are placed along a path (also known as \texttt{to}-style component, for their usage) and components that are nodes and can have any number of poles, or connections.
+
+Let's start with the first type of components and build a basic mesh:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+    \draw (0,0) to[isource] (0,3) -- (2,3)
+    to[R] (2,0) -- (0,0);
+\end{circuitikz}
+\end{LTXexample}
+
+The symbol for the current source can surprise somebody; this is actually the european-style symbol, and the symbols chosen reflects the default options of loaded in the package (see section~\ref{sec:package-options}). Let's change the style for now (the author of the tutorial, Romano, is European but he has used since ever American style circuit, so\dots); and while at it, let add the other branch and some label.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) to[isource, l=$I_0$] (0,3) -- (2,3)
+    to[R=$R_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3) to[R=$R_2$]
+          (4,0) -- (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+You can use a single path or multiple path when drawing your circuit, it's just a question of style (but be aware that closing path could be non-trivial, see section~\ref{sec:line-joins}), and you can use standard \TikZ\ lines (\verb|--|, \verb+|-+ or similar) for the wires. Nonetheless, sometime using the \Circuitikz\ specific \texttt{short} component for the wires can be useful, because then we can add labels and nodes at it, like for example in the following circuit.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) to[isource, l=$I_0$] (0,3)
+    to[short, -*, i=$I_0$] (2,3)
+    to[R=$R_1$, i=$i_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3)
+    to[R=$R_2$, i=$i_2$]
+    (4,0) to[short, -*] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+One of the problems with this circuit is that we would like to have the current in a different position, such as for example on the upper side of the resistors, so that Kirchoff's Current Law at the node is better shown to students. No problem; as you can see in section~\ref{curr-and-volt} you can use the position specifier \verb|<>^_}| after the key \texttt{i}:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) to[isource, l=$I_0$] (0,3)
+    to[short, -*, i=$I_0$] (2,3)
+    to[R=$R_1$, i>_=$i_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3)
+    to[R=$R_2$, i>_=$i_2$]
+    (4,0) to[short, -*] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Finally, we would like to add voltages indication for carrying out the current formulas; as the default position of the voltage signs seems a bit cramped to me, I am adding the \texttt{voltage shift} parameter to make a bit more space for it\dots
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american, voltage shift=0.5]
+    \draw (0,0) to[isource, l=$I_0$, v=$V_0$] (0,3)
+    to[short, -*, i=$I_0$] (2,3)
+    to[R=$R_1$, i>_=$i_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3)
+    to[R=$R_2$, i>_=$i_2$]
+    (4,0) to[short, -*] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\emph{Et voilá!}. Remember that this is still \LaTeX, which means that you have done a description of your circuit, which is, in a lot of way, independent of the visualization of it. If you ever have to adapt the circuit to, say, a journal that force European style and flows instead of currents, you just change a couple of things and you have what seems a completely different diagram:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[european, voltage shift=0.5]
+    \draw (0,0) to[isourceC, l=$I_0$, v=$V_0$] (0,3)
+    to[short, -*, f=$I_0$] (2,3)
+    to[R=$R_1$, f>_=$i_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3)
+    to[R=$R_2$, f>_=$i_2$]
+    (4,0) to[short, -*] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+And finally, this is still \TikZ, so that you can freely mix other graphics element to the circuit.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american, voltage shift=0.5]
+    \draw (0,0) to[isource, l=$I_0$, v=$V_0$] (0,3)
+    to[short, -*, f=$I_0$] (2,3)
+    to[R=$R_1$, f>_=$i_1$] (2,0) -- (0,0);
+    \draw (2,3) -- (4,3)
+    to[R=$R_2$, f>_=$i_2$]
+    (4,0) to[short, -*] (2,0);
+    \draw[red, thick] (1.5,2.5) rectangle (4.5,3.5)
+    node[pos=0.5, above]{KCL};
+\end{circuitikz}
+\end{LTXexample}
+
+\subsection{A more complex tutorial: circuits Romano's style.}
+\begingroup % do not propagate to the rest of the manual
+
+The idea is to draw a two-stage amplifier for a lesson, or exercise, on the different qualities of BJT an MOSFET transistors.
+Notice that this is a more ``personal'' tutorial, showing a way to draw circuits that is, in the author's opinion, highly reusable and easy to do.
+The idea is using relative coordinates and named nodes as much as possible, so that changes in the circuit are easily done by changing keys numbers of position, and crucially, each block is reusable in other diagrams.
+
+First of all, let's define a handy function to show the position of nodes:
+
+\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\begin{lstlisting}
+\def\coord(#1){coordinate(#1)}
+\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\end{lstlisting}
+
+
+
+The idea is that you can use \verb|\coord()| instead of \verb|coordinate()| in paths, and that will draw sort of \emph{markers} showing them. For example:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+    \draw (0,0) node[npn](Q){};
+    \path (Q.center) \coord(center)
+    (Q.B) \coord(B) (Q.C) \coord(C)
+    (Q.E) \coord(E);
+\end{circuitikz}
+\end{LTXexample}
+
+After the circuit is drawn, simply commenting out the second definition of \verb|\coord| will hide all the markers.
+
+So let's start with the first stage transistor; given that my preferred way of drawing a MOSFET is with arrows, I'll start issuing the command \verb|\ctikzset{tripoles/mos style/arrows}|:
+
+\ctikzset{tripoles/mos style/arrows}
+\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+\ctikzset{tripoles/mos style/arrows}
+\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
+    \draw (0,0) node[nmos](Q1){};
+    \draw (Q1.center) node[right]{\killdepth{Q1}};
+\end{circuitikz}
+\end{LTXexample}
+
+Another thing I like to modify with respect to the standard is the position of the arrows in transistors, which are normally midway the symbol. Issuing the following settings will move the arrows to the end or start  of the corresponding pin.
+
+\ctikzset{tripoles/mos style/arrows,
+tripoles/npn/arrow pos=0.8,
+tripoles/pnp/arrow pos=0.8,
+tripoles/nmos/arrow pos=0.8,
+tripoles/pmos/arrow pos=0.6, }
+\begin{lstlisting}
+\ctikzset{tripoles/mos style/arrows,
+tripoles/npn/arrow pos=0.8,
+tripoles/pnp/arrow pos=0.8,
+tripoles/nmos/arrow pos=0.8,
+tripoles/pmos/arrow pos=0.6, }
+\end{lstlisting}
+
+The tricky thing about \verb|\killdepth{}| macro is a finicky details; I do not like the standard position of labels on transistors (which is near the collector/drain) so I plot the label at the right of the \texttt{center} anchor. Without the \verb|\killdepth| macro, the labels of different transistor will be adjusted so that the center of the box is at the \texttt{center} anchor, and as an effect, labels with descenders (like Q) will have a different baseline than labels without. You can see this here (it's really subtle):
+
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+\draw (0,0) node[nmos](Q1){} ++(2,0) node[nmos](M1){};
+\draw (Q1.center) node[right]{q1};
+\draw (M1.center) node[right]{m1};
+\draw [red] (Q1.center) ++(0,-0.7ex) -- ++(3,0);
+\draw (0,-2)node[nmos](Q1){} ++(2,0) node[nmos](M1){};
+\draw (Q1.center) node[right]{\killdepth{q1}};
+\draw (M1.center) node[right]{\killdepth{m1}};
+\draw [red] (Q1.center) ++(0,-0.7ex) -- ++(3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+We will start connecting the first transistor with the power supply with a couple of resistors. Notice that I am naming the nodes \texttt{GND}, \texttt{VCC} and \texttt{VEE}, so that I can use the coordinates to have all the supply rails at the same vertical position (more on this later).
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+    \draw (0,0) node[nmos,](Q1){};
+    \draw (Q1.center) node[right]{\killdepth{Q1}};
+    \draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3)
+        node[vee](VEE){$V_{EE}=\SI{-10}{V}$};
+    \draw (Q1.D) to[R, l2_=$R_D$ and \SI{10}{k\ohm}] ++(0,3)
+        node[vcc](VCC){$V_{CC}=\SI{10}{V}$};
+    \draw (Q1.S) to[short] ++(2,0) to[C=$C_1$] ++(0,-1.5) node[ground](GND){};
+    \path (GND) \coord(GND) (VCC) \coord(VCC)
+        (VEE) \coord(VEE);
+\end{circuitikz}
+\end{LTXexample}
+
+After that, let's add the input part. I will use a named node here, to refer to it to add the input source. Notice how the ground node is positioned: the coordinate \texttt{(in |- GND)} is the point with the horizontal coordinate of \texttt{(in)}  and the horizontal one of \texttt{(GND)}, lining it up with the ground of the capacitor $C_1$.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american, scale=0.7]
+    \draw (0,0) node[nmos,](Q1){};
+    \draw (Q1.center) node[right]
+        {\killdepth{Q1}};
+    \draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3)
+        node[vee](VEE){$V_{EE}=\SI{-10}{V}$};
+    \draw (Q1.D) to[R, l2_=$R_D$ and \SI{10}{k\ohm}] ++(0,3)
+        node[vcc](VCC){$V_{CC}=\SI{10}{V}$};
+    \draw (Q1.S) to[short] ++(2,0) to[C=$C_1$] ++(0,-1.5) node[ground](GND){};
+    \draw (Q1.G) to[short] ++(-1,0)
+        \coord (in) to[R, l2^=$R_G$ and \SI{1}{M\ohm}]
+        (in |- GND) node[ground]{};
+    \draw (in) to[C, l_=$C_2$,*-o] ++(-1.5,0) node[left](vi1){$v_i=v_{i1}$};
+\end{circuitikz}
+\end{LTXexample}
+
+Notice that the only absolute coordinate here is the first one, \texttt{(0,0)}; so the elements are connected with relative movements and can be moved by just changing one number (for example, changing the \verb| to[C=$C_1$] ++(0,-1.5) | will move \emph{all} the grounds down).
+
+This is the final circuit, with the nodes still marked:
+\begin{lstlisting}
+\tikzset{blockdef/.style={%
+    {Straight Barb[harpoon, reversed, right, length=0.2cm]}-{Straight Barb[harpoon, reversed, left, length=0.2cm]},
+    blue, %densely dotted,
+}}
+\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
+\def\coord(#1){coordinate(#1)}
+\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\begin{circuitikz}[american, ]
+    \draw (0,0) node[nmos,](Q1){};
+    \draw (Q1.center) node[right]{\killdepth{Q1}};
+    \draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3) node[vee](VEE){$V_{EE}=\SI{-10}{V}$}; %define VEE level
+    \draw (Q1.S) to[short] ++(2,0) to[C=$C_1$] ++(0,-1.5) node[ground](GND){};
+    \draw (Q1.G) to[short] ++(-1,0) \coord (in) to[R, l2^=$R_G$ and \SI{1}{M\ohm}] (in |- GND) node[ground]{};
+    \draw (in) to[C, l_=$C_2$,*-o] ++(-1.5,0) node[left](vi1){$v_i=v_{i1}$};
+    \draw (Q1.D) to[R, l2_=$R_D$ and \SI{10}{k\ohm}] ++(0,3) node[vcc](VCC){$V_{CC}=\SI{10}{V}$};
+    \draw (Q1.D) to[short, -o] ++(1,0) node[right](vo1){$v_{o1}$};
+    %
+    \path (vo1) -- ++(3,0) \coord(bjt);
+    %
+    \draw (bjt) node[npn, ](Q2){};
+    \draw (Q2.center) node[right]{\killdepth{Q2}};
+    \draw (Q2.B) to[short, -o] ++(-0.5,0) node[left](vi2){$v_{12}$};
+    \draw (Q2.E) to[R,l2^=$R_E$ and \SI{9.3}{k\ohm}] (Q2.E |- VEE) node[vee]{};
+    \draw (Q2.E) to[short, -o] ++(1,0) node[right](vo2){$v_{o2}$};
+    \draw (Q2.C) to[short] (Q2.C |- VCC) node[vcc]{};
+    %
+    \path (vo2) ++(1.5,0) \coord(load);
+    \draw (load) to[C=$C_3$] ++(1,0) \coord(tmp) to[R=$R_L$] (tmp |- GND) node[ground]{};
+    \draw [densely dashed] (vo2) -- (load);
+    %
+    \draw [densely dashed] (vo1) -- (vi2);
+    %
+    \draw [blockdef](vi1|-VEE) ++(0,-2) \coord(tmp)
+          -- node[midway, fill=white]{bloque 1} (vo1|- tmp);
+          \draw [blockdef] (vi2|-VEE) ++(0,-2) \coord(tmp)
+          -- node[midway, fill=white]{bloque 2} (vo2|- tmp);
+
+\end{circuitikz}
+\end{lstlisting}
+
+\tikzset{blockdef/.style={%
+    {Straight Barb[harpoon, reversed, right, length=0.2cm]}-{Straight Barb[harpoon, reversed, left, length=0.2cm]},
+    blue, %densely dotted,
+}}
+\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}}
+\def\coord(#1){coordinate(#1)}
+\def\coord(#1){node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\tiny, pin distance=0.1cm, pin edge={red, overlay,}]45:#1}](#1){}}
+\begin{circuitikz}[american, ]
+    \draw (0,0) node[nmos,](Q1){};
+    \draw (Q1.center) node[right]{\killdepth{Q1}};
+    \draw (Q1.S) to[R, l2^=$R_S$ and \SI{5}{k\ohm}] ++(0,-3) node[vee](VEE){$V_{EE}=\SI{-10}{V}$}; %define VEE level
+    \draw (Q1.S) to[short] ++(2,0) to[C=$C_1$] ++(0,-1.5) node[ground](GND){};
+    \draw (Q1.G) to[short] ++(-1,0) \coord (in) to[R, l2^=$R_G$ and \SI{1}{M\ohm}] (in |- GND) node[ground]{};
+    \draw (in) to[C, l_=$C_2$,*-o] ++(-1.5,0) node[left](vi1){$v_i=v_{i1}$};
+    \draw (Q1.D) to[R, l2_=$R_D$ and \SI{10}{k\ohm}] ++(0,3) node[vcc](VCC){$V_{CC}=\SI{10}{V}$};
+    \draw (Q1.D) to[short, -o] ++(1,0) node[right](vo1){$v_{o1}$};
+    %
+    \path (vo1) -- ++(3,0) \coord(bjt);
+    %
+    \draw (bjt) node[npn, ](Q2){};
+    \draw (Q2.center) node[right]{\killdepth{Q2}};
+    \draw (Q2.B) to[short, -o] ++(-0.5,0) node[left](vi2){$v_{12}$};
+    \draw (Q2.E) to[R,l2^=$R_E$ and \SI{9.3}{k\ohm}] (Q2.E |- VEE) node[vee]{};
+    \draw (Q2.E) to[short, -o] ++(1,0) node[right](vo2){$v_{o2}$};
+    \draw (Q2.C) to[short] (Q2.C |- VCC) node[vcc]{};
+    %
+    \path (vo2) ++(1.5,0) \coord(load);
+    \draw (load) to[C=$C_3$] ++(1,0) \coord(tmp) to[R=$R_L$] (tmp |- GND) node[ground]{};
+    \draw [densely dashed] (vo2) -- (load);
+    %
+    \draw [densely dashed] (vo1) -- (vi2);
+    %
+    \draw [blockdef](vi1|-VEE) ++(0,-2) \coord(tmp)
+          -- node[midway, fill=white]{bloque 1} (vo1|- tmp);
+          \draw [blockdef] (vi2|-VEE) ++(0,-2) \coord(tmp)
+          -- node[midway, fill=white]{bloque 2} (vo2|- tmp);
+
+\end{circuitikz}
+
+
+\endgroup
+
+
+
 \section{The components}
 
-Here follows the list of all the shapes defined by Circui\TikZ. These are all \texttt{pgf} nodes, so they are usable in both \texttt{pgf} and \TikZ.
 
-\subsubsection*{Drawing normal components}
-Normal components (monopoles, multipoles) can be drawn at a specified point with this syntax, where \verb!#1! is the name of the component:
-\begin{verbatim}
-\begin{center}\begin{circuitikz} \draw 
-   (0,0) node[#1,#2] (#3) {#4}
-; \end{circuitikz} \end{center}
-\end{verbatim}
+Components in \Circuitikz{} come in two forms: a path-style form, to be used in \texttt{to} path specifications, and node-style, which will be instantiated by a \texttt{node} specification.
+
+\subsection{Path-style components}
+
+The path-style components are used as in the following way:
+\begin{lstlisting}
+    \begin{circuitikz}
+    \draw (0,0) to[#1=#2, #options] (2,0);
+    \end{circuitikz}
+\end{lstlisting}
+where \verb|#1| is the name of the component, \verb|#2| is an (optional) label, and \verb|options| are optional labels, annotations, style specifier that will be explained in the rest of the manual.
+
+Transistors and some other node-style components can also be placed using the syntax for bipoles. See section~\ref{sec:transasbip}.
+
+Most path-style components can be used as a node-style components; to access them, you add a \texttt{shape} to the main name of component (for example, \texttt{diodeshape}). Such a ``node name'' is specified in the description of each component.
+
+\subsubsection{Anchors}
+
+Normally, path-style component do not need anchors, although they have them just in case you need them. You have the basic ``geographical'' anchors (bipoles are defined horizontally and then rotate as needed):
+\begin{center}
+    \begin{circuitikz}[
+        ]
+        \draw (0,0) to[resistor, name=R] ++(2,0);
+        \path (R.center) \showcoord(center)<-90:0.3>;
+        \path (R.left) \showcoord(left)<135:0.3>;
+        \path (R.right) \showcoord(right)<45:0.3>;
+        \draw (5,0) to[resistor, name=R] ++(2,0);
+        \foreach \n/\a/\d in {north/90/0.3, north east/45/0.3, east/0/0.5,
+            south east/-45/0.3, south/-90/0.3, south west/-135/0.3,
+        west/180/0.5, north west/135/0.3}
+        \path (R.\n) \showcoord(\n)<\a:\d>;
+        \draw (10,-1) to[resistor, name=R] ++(0,2);
+        \foreach \n/\a/\d in {n/135/0.3, e/45/0.3,
+        s/-45/0.3, w/-135/0.3}
+        \path (R.\n) \showcoord(\n)<\a:\d>;
+    \end{circuitikz}
+\end{center}
+In the case of bipoles, also shortened geographical anchors exists. In the description, it will be shown when a bipole has additional anchors. To use the anchors, just give a name to the bipole element.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) to[potentiometer, name=P, mirror] ++(0,2);
+    \draw (P.wiper) to[L] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Alternatively, that you can use the shape form, and then use the \texttt{left} and \texttt{right} anchors to do your connections.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) node[potentiometershape, rotate=-90](P){};
+    \draw (P.wiper) to[L] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Customization}
+\label{sec:components-size}
+
+
+Pretty much all Circui\TikZ\ relies heavily on \texttt{pgfkeys} for value handling and configuration. Indeed, at the beginning of \texttt{circuitikz.sty} and in the file \texttt{pfgcirc.define.tex}  a series of key definitions can be found that modify all the graphical characteristics of the package.
+
+All can be varied using the \verb!\ctikzset! command, anywhere in the code.
+
+\paragraph{Components size}
+Perhaps the most important parameter is \texttt{bipoles/length}  (default \SI{1.4}{cm}), which
+can be interpreted as the length of a resistor (including reasonable connections): all other lengths are relative to this value. For instance:
+
+\begin{LTXexample}[pos=t,varwidth=true]
+\ctikzset{bipoles/length=1.4cm}
+\begin{circuitikz}[scale=1.2]\draw
+  (0,0) node[anchor=east] {B}
+        to[short, o-*] (1,0)
+        to[R=20<\ohm>, *-*] (1,2)
+        to[R=10<\ohm>, v=$v_x$] (3,2) -- (4,2)
+        to[cI=$\frac{\si{\siemens}}{5} v_x$, *-*] (4,0) -- (3,0)
+        to[R=5<\ohm>, *-*] (3,2)
+  (3,0) -- (1,0)
+  (1,2) to[short, -o] (0,2) node[anchor=east]{A}
+;\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[pos=t,varwidth=true]
+\ctikzset{bipoles/length=.8cm}
+\begin{circuitikz}[scale=1.2]\draw
+  (0,0) node[anchor=east] {B}
+        to[short, o-*] (1,0)
+        to[R=20<\ohm>, *-*] (1,2)
+        to[R=10<\ohm>, v=$v_x$] (3,2) -- (4,2)
+        to[cI=$\frac{\siemens}{5} v_x$, *-*] (4,0) -- (3,0)
+        to[R=5<\ohm>, *-*] (3,2)
+  (3,0) -- (1,0)
+  (1,2) to[short, -o] (0,2) node[anchor=east]{A}
+;\end{circuitikz}
+\end{LTXexample}
+
+\paragraph{Thickness of the lines} (globally)
+
+You can change the thickness of the components lines with the parameter \texttt{bipoles/thickness} (default 2). The number is relative to the thickness of the normal lines leading to the component.
+
+\begin{LTXexample}[varwidth=true]
+    \ctikzset{bipoles/thickness=1}
+    \tikz \draw (0,0) to[C=1<\farad>] (2,0); \par
+    \ctikzset{bipoles/thickness=4}
+    \tikz \draw (0,0) to[C=1<\farad>] (2,0);
+\end{LTXexample}
+
+\paragraph{Shape of the components} (on a per-component-class basis)
+
+The shape of the components are adjustable with a lot of parameters; in this manual we will comment the main ones, but you can look into the source files specified above to find more.
+\begin{LTXexample}[varwidth=true]
+    \tikz \draw (0,0) to[R=1<\ohm>] (2,0); \par
+    \ctikzset{bipoles/resistor/height=.6}
+    \tikz \draw (0,0) to[R=1<\ohm>] (2,0);
+\end{LTXexample}
+
+
+\subsubsection{Descriptions}
+
+The typical entry in the component list will be like this:
+
+\begin{groupdesc}
+    \circuitdescbip{resistor}{resistor, american style}{R, american resistor}
+    \circuitdescbip[potentiometer]{pR}{potentiometer, american style}{pR, american potentiometer}( wiper/0/0.3 )
+\end{groupdesc}
+
+where you have all the needed information about the bipole, with also no-standard anchors. If the component can be filled it will be specified in the description. In addition, as an example, the component shown will be filled with the option \texttt{fill=cyan!30!white}:
+
+\begin{groupdesc}
+    \circuitdescbip*{ammeter}{Ammeter}{}
+\end{groupdesc}
+
+\subsection{Node-style components}
+Node-style components (monopoles, multipoles) can be drawn at a specified point with this syntax, where \verb!#1! is the name of the component:
+\begin{lstlisting}
+\begin{circuitikz}
+    \draw (0,0) node[#1,#2] (#3) {#4};
+\end{circuitikz}
+\end{lstlisting}
 \noindent
 Explanation of the parameters:\\
 \texttt{\#1}: component name\footnote{For using bipoles as nodes, the name of the node is \texttt{\#1shape}.} (mandatory)\\
@@ -254,211 +752,430 @@ Explanation of the parameters:\\
 \texttt{\#3}: name of an anchor (optional)\\
 \texttt{\#4}: text written to the text anchor of the component (optional)\\
 
+Most path-style components can be used as a node-style components; to access them, you add a \texttt{shape} to the main name of component (for example, \texttt{diodeshape}). Such a ``node name'' is specified in the description of each component.
+
 \begin{framed}
-	\noindent \textbf{Note for \TikZ\ newbies:}	Nodes must have curly brackets at the end, even when empty. An optional anchor (\texttt{\#3}) can be defined within round brackets to be addressed again later on. And please don't forget the semicolon to terminate the \texttt{\textbackslash draw} command.
+	\noindent \textbf{Notice:}	Nodes must have curly brackets at the end, even when empty. An optional anchor (\texttt{\#3}) can be defined within round brackets to be addressed again later on. And please don't forget the semicolon to terminate the \texttt{\textbackslash draw} command.
 \end{framed}
 
-\subsubsection*{Drawing bipoles/two-ports}
-Bipoles/Two-ports (plus some special components) can be drawn between two points using the following command:
-
-\begin{verbatim}
-\begin{center}\begin{circuitikz} \draw 
-   (0,0) to[#1,#2] (2,0)
-; \end{circuitikz} \end{center}
-\end{verbatim}
-\noindent
-Explanation of the parameters:\\
-\texttt{\#1}: component name (mandatory)\\
-\texttt{\#2}: list of comma separated options (optional)\\
-\noindent
-Transistors and some other components can also be placed using the syntax for bipoles. See section~\ref{sec:transasbip}.
-
 \begin{framed}
-	If using the \verb!\tikzexternalize! feature, as of Ti\emph{k}z 2.1 all pictures must end with \verb!\end{tikzpicture}!. Thus you \emph{cannot} use the \verb!circuitikz! environment.
-	
-	Which is ok: just use the environment \verb!tikzpicture!: everything will work there just fine.
+	\noindent\textbf{Also notice:} If using the \verb!\tikzexternalize! feature, as of Ti\emph{k}z 2.1 all pictures must end with \verb!\end{tikzpicture}!. Thus you \emph{cannot} use the \verb!circuitikz! environment.
+
+	\noindent Which is ok: just use the environment \verb!tikzpicture!: everything will work there just fine.
 \end{framed}
 
-\subsection{Monopoles}
-\begin{itemize}
-	\circuititem{ground}{Ground}{}
-	\circuititem{rground}{Reference ground}{}
-	\circuititem{sground}{Signal ground}{}
-	\circuititem{tground}{Thicker ground}{}
-	\circuititem{nground}{Noiseless ground}{}
-	\circuititem{pground}{Protective ground}{}
-	\circuititem{cground}{Chassis ground\footnote{These last three were contributed by Luigi «Liverpool»)}}{}
-	\circuititem{antenna}{Antenna}{}
-	\circuititem{rxantenna}{Receiving antenna}{}
-	\circuititem{txantenna}{Transmitting antenna}{}
-	\circuititem{tlinestub}{Transmission line stub}{}
-	\circuititem{vcc}{VCC/VDD}{}
-	\circuititem{vee}{VEE/VSS}{}
-	\circuititem{match}{match}{}
-	%\circuititem{oscillator}{LO\footnote{These last three come from Stefan Erhardt's contribution of block diagram components}}{}
-\end{itemize}
+\subsubsection{Mirroring and flipping}
+
+Mirroring and flipping of node components is obtained by using the \TikZ\ keys \texttt{xscale} and \texttt{yscale}. Notice that this parameters affect also text labels, so they need to be un-scaled by hand.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,2)
+        node[rground, yscale=-1] {%
+        \scalebox{1}[-1]{ GND}}
+        to[R=$R_1$] (0,0)
+        node[sground] {};
+\end{circuitikz}
+\end{LTXexample}
 
+\subsubsection{Anchors}
 
-\subsection{Bipoles}
+Node components anchors are variable across the various kind of components, so they will described better after each category is presented in the manual.
 
-\subsubsection{Instruments}
-\begin{itemize}
-	\circuititembip{ammeter}{Ammeter}{}
-	\circuititembip{voltmeter}{Voltmeter}{}
-	\circuititembip{ohmmeter}{Ohmmeter}{}
-\end{itemize}	
+\subsubsection{Descriptions}
 
-\subsubsection{Basic resistive bipoles}
-\begin{itemize}
-	\circuititembip{short}{Short circuit}{}
-	\circuititembip{open}{Open circuit}{}
-	
-	\circuititembip{lamp}{Lamp}{}
-	\circuititembip{generic}{Generic (symmetric) bipole}{}
-	\circuititembip{tgeneric}{Tunable generic bipole}{}
-	\circuititembip{ageneric}{Generic asymmetric bipole}{}
-	\circuititembip{fullgeneric}{Generic asymmetric bipole (full)}{}
-	\circuititembip{tfullgeneric}{Tunable generic  bipole (full)}{}
-	\circuititembip{memristor}{Memristor}{Mr}
-\end{itemize}	
-
-\subsubsection{Resistors and the like}
-
-If (default behaviour) \texttt{americanresistors} option is active (or the style \texttt{[american resistors]} is used), the resistor is displayed as follows:
-\begin{itemize}
-  	\ctikzset{resistor=american}
-  	\circuititembip{R}{Resistor}{american resistor}
-	\circuititembip{vR}{Variable resistor}{variable american resistor}
-	\circuititembip{pR}{Potentiometer}{american potentiometer}
-\end{itemize}
+The typical entry in the component list will be like this:
+\begin{groupdesc}
+    \circuitdesc{cute spdt down arrow}{Cute spdt down with arrow}{}
+    \circuitdesc{npn}{\scshape npn}{}( B/180/0.2,C/0/0.2,E/0/0.2 )
+\end{groupdesc}
+
+All the shapes defined by Circui\TikZ. These are all \texttt{pgf} nodes, so they are usable in both \texttt{pgf} and \TikZ.
+If the component can be filled it will be specified in the description. In addition, as an example, the component shown will be filled with the option \texttt{fill=cyan!30!white}:
+
+\begin{groupdesc}
+    \circuitdesc*{plain amp}{Plain amplifier}{}( out/45/0.3 )
+\end{groupdesc}
+
+\subsection{Grounds and supply voltages}
+
+For the grounds, the \texttt{center} anchor is put on the connecting point of the symbol, so that you can use them directly in a \texttt{path} specification.
+
+\begin{groupdesc}
+    \circuitdesc{ground}{Ground}{}( center/0/0.3 )
+    \circuitdesc{rground}{Reference ground}{}
+    \circuitdesc*{sground}{Signal ground}{}
+    \circuitdesc{tground}{Thicker ground}{}
+    \circuitdesc{nground}{Noiseless ground}{}
+    \circuitdesc{pground}{Protective ground}{}
+    \circuitdesc{cground}{Chassis ground\footnotemark}{}
+    \footnotetext{These last three were contributed by Luigi «Liverpool»)}
+    \circuitdesc{eground}{European style ground}{}
+    \circuitdesc{eground2}{European style ground, version 2\footnotemark}{}
+    \footnotetext{These last two were contributed by \texttt{@fotesan})}
+    \circuitdesc{vcc}{VCC/VDD}{}
+    \circuitdesc{vee}{VEE/VSS}{}
+\end{groupdesc}
+
+\subsubsection{Grounds anchors}
+
+Anchors for grounds are a bit strange, given that they have the \texttt{center} spot at the same location than \texttt{north} and all the ground will develop ``going down'':
+
+\showanchors[baseline]{ground, scale=2}{}(north/90/0.4, north east/45/0.4, east/0/0.4, south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4)
+\showanchors[baseline]{ground, scale=2}{}(left/135/0.2, right/45/0.2, center/-180/0.2)
+
+
+
+\subsection{Instruments}
+\begin{groupdesc}
+    \circuitdescbip*{ammeter}{Ammeter}{}
+    \circuitdescbip*{voltmeter}{Voltmeter}{}
+    \circuitdescbip*{ohmmeter}{Ohmmeter}{}
+    \circuitdescbip*{rmeter}{Round meter (use \texttt{t=...} for the symbol)}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \circuitdescbip*{rmeterwa}{Round meter with arrow (use \texttt{t=...} for the symbol)}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \circuitdescbip*{smeter}{Square meter (use \texttt{t=...} for the symbol)}{}(left/135/0.2, right/45/0.2, center/-90/0.3, in 1/-135/.5, in 2/-45/.5)
+    \circuitdescbip*{qiprobe}{QUCS-style current probe}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \circuitdescbip*{qvprobe}{QUCS-style voltage probe}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \circuitdescbip*{qpprobe}{QUCS-style power probe}{}(left/135/0.2, right/45/0.2, center/-90/0.3, v+/-135/.5, v-/-45/.5)
+    \circuitdescbip*[oscope]{oscope}{Oscilloscope\footnotemark}{}(left/135/0.2, right/45/0.2,
+    in 1/-135/0.4, in 2/-45/0.4)
+    \footnotetext{Suggested by \texttt{@nobrl} on GitHub}
+    \circuitdescbip{iloop}{Current loop (symbolic)}{}(left/135/0.2, right/45/0.2, center/-90/0.3, i/30/0.4)
+    \circuitdescbip{iloop2}{Current loop (real)}{}(left/135/0.2, right/-45/0.2, center/-90/0.3, i+/135/0.4, i-/45/0.4)
+\end{groupdesc}
+
+\subsubsection{Rotation-invariant elements}
+
+The \texttt{oscope} element will not rotate the ``graph'' shown with the component:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \foreach \a in {0,45,...,350} {
+        \draw (0,0) to[oscope] (\a:3);
+    }
+\end{circuitikz}
+\end{LTXexample}
+
+The \texttt{rmeter}, \texttt{rmaterwa}, and \texttt{smeter} have the same behavior.
+
+\subsubsection{Instruments as node elements}
+
+The node-style usage of the \texttt{oscope} is also interesting, using the additional \texttt{in 1} and \texttt{in 2} anchors; notice that in this case you can use the text content of the node to put labels above it.
+Moreover, you can change the size of the oscilloscope by changing \texttt{bipoles/oscope/width} and \texttt{bipoles/oscope/height} keys (which both default at 0.6).
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,1)
+        to[oscope=$C_1$, fill=green!20!gray, name=O1] ++(2,0);
+    \path (O1.right)
+        node[ground, scale=0.5, below right=4pt]{};
+    \ctikzset{bipoles/oscope/width=1.0}
+    \draw (1,-1)
+        node[oscopeshape, fill=yellow!20!orange](O2){$C_2$};
+    \draw (O2.in 2) to[short, *-] ++(0,-0.5) node[ground]{};
+    \draw (O2.in 1) to[short, *-] ++(0,-0.5)
+           -- ++(-1,0) node[currarrow, xscale=-1]{};
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Measuring voltage and currents, multiple ways}
+
+This is the classical (legacy) option, with the \texttt{voltmeter} and \texttt{ammeter}. The problem is that elements are intrinsically horizontal and so they looks funny if put in vertical way.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [ammeter] ++(0,-2) node[ground]{};
+    \draw (1,0) to[voltmeter] ++(0,-2)
+    node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+So the solution is often changing the structure to keep the meters in horizontal position.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [ammeter] ++(2,0) --
+    ++(0,-1) node[ground]{};
+    \draw (1,0) -- (1,1) to[voltmeter]
+    ++(2,0) node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+Since version 0.9.0 you have more options for the measuring instruments. You can use the generic \texttt{rmeterwa} (round meter with arrow), to which you can specify the internal symbol with the option \texttt{t=...} (and is fillable).
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [rmeterwa, t=A, i=$i$] ++(0,-2) node[ground]{};
+    \draw (1,0) to[rmeterwa, t=V, v=$v$] ++(0,-2)
+    node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+This kind of component will maintain the symbol horizontal whatever the orientation:
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [rmeterwa, t=A, i=$i$] ++(2,0) --
+    ++(0,-1) node[ground]{};
+    \draw (1,0) -- (1,1) to[rmeterwa, t=V, v^=$v$]
+    ++(2,0) node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+The plain \texttt{rmeter} is the same, without the measuring arrow:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [rmeter, t=A, i=$i$] ++(0,-2) node[ground]{};
+    \draw (1,0) to[rmeter, t=V, v=$v$] ++(0,-2)
+    node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+
+If you prefer, you have the option to use square meters, to have more visual difference from generators:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [smeter, t=A, i=$i$] ++(0,-2) node[ground]{};
+    \draw (1,0) to[smeter, t=V, v=$v$] ++(0,-2)
+    node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+Another possibility is to use the QUCS\footnote{QUCS is an open source circuit simulator: \url{http://qucs.sourceforge.net/}}-styled probes, which have the nice property of explictly showing the type of connection (in series or parallel) of the meter:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(2,0)
+    to [qiprobe, l=$i$] ++(0,-2) node[ground]{};
+    \draw (1,0) to[qvprobe, l=$v$] ++(0,-2)
+    node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+If you want to explicitly show a power measurement, you can use the power probe \texttt{qpprobe} and using the additional anchors \texttt{v+} and \texttt{v-} :
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) to[short,-*]  ++(1,0) coordinate(b)
+    to[R] ++(2,0) to [qpprobe, l=$i$, a=$v$, name=P]
+    ++(0,-2.5) node[ground](GND){};
+    \draw (P.v-) -| ++(-0.5,-1) coordinate(a)
+    to [short, -*] (a-|GND);
+    \draw (P.v+) -| (b);
+\end{circuitikz}
+\end{LTXexample}
+
+The final possibility is to use oscilloscopes, like for example:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(3,0)
+    to [iloop, mirror, name=I] ++(0,-2)
+    node[ground] (GND){};
+    \draw (1,0) to[oscope, v=$v$] ++(0,-2)
+    node[ground]{};
+    \draw (I.i) -- ++(-0.5,0) node[oscopeshape, anchor=right, name=O]{};
+    \draw (O.south) -- (O.south |- GND) node[ground]{};
+\end{circuitikz}
+\end{LTXexample}
+
+Or, if you want  a more physical structure for the measurement setup:
+
+
+\begin{LTXexample}[varwidth=true, pos=b]
+\begin{circuitikz}[american]
+    \draw (0,0) -- ++(1,0) to[R] ++(3,0) to [iloop2, name=I] ++(0,-2)
+    node[ground] (GND){};
+    \ctikzset{bipoles/oscope/width=1.6}\ctikzset{bipoles/oscope/height=1.2}
+    \node [oscopeshape, fill=green!10](O) at (6,2){};
+    \node [bnc, xscale=-1, anchor=zero](bnc1) at (O.in 1){};
+    \node [bnc, , anchor=zero, rotate=-90](bnc2) at (O.in 2){};
+    \draw [-latexslim] (bnc1.hot) -| (1,0);
+    \draw (bnc2.hot) |- (I.i+);
+    \draw (I.i-) node[ground, scale=0.5]{};
+\end{circuitikz}
+\end{LTXexample}
+
+\subsection{Resistive bipoles}
+
+\begin{groupdesc}
+    \circuitdescbip{short}{Short circuit}{}
+    \circuitdescbip{open}{Open circuit}{}
+    \circuitdescbip*{generic}{Generic (symmetric) bipole}{}
+    \circuitdescbip*{tgeneric}{Tunable generic bipole}{}
+    \circuitdescbip*{ageneric}{Generic asymmetric bipole}{}
+    \circuitdescbip{fullgeneric}{Generic asymmetric bipole (full)}{}
+    \circuitdescbip{tfullgeneric}{Tunable generic  bipole (full)}{}
+    \circuitdescbip*{memristor}{Memristor}{Mr}
+\end{groupdesc}
+
+If \texttt{americanresistors} option is active (or the style \texttt{[american resistors]} is used; this is the default for the package), the resistors are displayed as follows:
+\begin{groupdesc}
+    \ctikzset{resistor=american}
+    \circuitdescbip[resistor]{R}{Resistor}{american resistor}
+    \circuitdescbip[vresistor]{vR}{Variable resistor}{variable american resistor}
+    \circuitdescbip[potentiometer]{pR}{Potentiometer}{american potentiometer}( wiper/0/0.3 )
+    \circuitdescbip[resistivesens]{sR}{Resisitive sensor}{american resisitive sensor}( label/0/0.3 )
+\end{groupdesc}
 
 If  instead \texttt{europeanresistors} option is active (or the style \texttt{[european resistors]} is used), the resistors, variable resistors and potentiometers are displayed as follows:
-\begin{itemize}
-  	\ctikzset{resistor=european}
-  	\circuititembip{R}{Resistor}{european resistor}
-	\circuititembip{vR}{Variable resistor}{european variable resistor}
-	\circuititembip{pR}{Potentiometer}{european potentiometer}
-	\ctikzset{resistor=american} % reset default
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{resistor=european}
+    \circuitdescbip*[generic]{R}{Resistor}{european resistor}
+    \circuitdescbip*[tgeneric]{vR}{Variable resistor}{variable european resistor}
+    \circuitdescbip*[genericpotentiometer]{pR}{Potentiometer}{european potentiometer}( wiper/0/0.3 )
+    \circuitdescbip*[thermistor]{sR}{Resistive sensor}{european resistive sensor}( label/0/0.3 )
+    \ctikzset{resistor=american} % reset default
+\end{groupdesc}
 
 Other miscellaneous resistor-like devices:
-\begin{itemize}
-  	\circuititembip{varistor}{Varistor}{}
-	\circuititembip{phR}{Photoresistor}{photoresistor}
-	\circuititembip{thermocouple}{Thermocouple}{}
-	\circuititembip{thR}{Thermistor}{thermistor}
-	\circuititembip{thRp}{PTC thermistor}{thermistor ptc}
-	\circuititembip{thRn}{NTC thermistor}{thermistor ntc}
-	\circuititembip{fuse}{Fuse}{}
-	\circuititembip{afuse}{Asymmetric fuse}{asymmetric fuse}
-\end{itemize}
-
-\subsubsection{Diodes and such}
-\begin{itemize}
-	\circuititembip{empty diode}{Empty diode}{Do}
-	\circuititembip{empty Schottky diode}{Empty Schottky diode}{sDo}
-	\circuititembip{empty Zener diode}{Empty Zener diode}{zDo}
-	\circuititembip{empty ZZener diode}{Empty ZZener diode}{zzDo}
-	\circuititembip{empty tunnel diode}{Empty tunnel diode}{tDo}
-	\circuititembip{empty photodiode}{Empty photodiode}{pDo}
-	\circuititembip{empty led}{Empty led}{leDo}
-	\circuititembip{empty varcap}{Empty varcap}{VCo}
-	\circuititembip{full diode}{Full diode}{D*}
-	\circuititembip{full Schottky diode}{Full Schottky diode}{sD*}
-	\circuititembip{full Zener diode}{Full Zener diode}{zD*}
-	\circuititembip{full ZZener diode}{Full ZZener diode}{zzD*}
-	\circuititembip{full tunnel diode}{Full tunnel diode}{tD*}
-	\circuititembip{full photodiode}{Full photodiode}{pD*}
-	\circuititembip{full led}{Full led}{leD*}
-	\circuititembip{full varcap}{Full varcap}{VC*}
-	\circuititembip{stroke diode}{Stroke diode}{D-}
-	\circuititembip{stroke Schottky diode}{Stroke Schottky diode}{sD-}
-	\circuititembip{stroke Zener diode}{Stroke Zener diode}{zD-}
-	\circuititembip{stroke ZZener diode}{Stroke ZZener diode}{zzD-}
-	\circuititembip{stroke tunnel diode}{Stroke tunnel diode}{tD-}
-	\circuititembip{stroke photodiode}{Stroke photodiode}{pD-}
-	\circuititembip{stroke led}{Stroke led}{leD-}
-	\circuititembip{stroke varcap}{Stroke varcap}{VC-}
-	\end{itemize}
-
-\subsubsection{Other tripole-like diodes}\label{sec:othertrip} The following tripoles are entered with the usual command of the form 
-\begin{itemize}
-	\circuititembip{triac}{Standard triac (shape depends on package option)}{Tr}
-	\circuititembip{empty triac}{Empty triac}{Tro}
-	\circuititembip{full triac}{Full triac}{Tr*}
-	\circuititembip{thyristor}{Standard thyristor (shape depends on package option)}{Ty}
-	\circuititembip{empty thyristor}{Empty thyristor}{Tyo}
-	\circuititembip{full thyristor}{Full thyristor}{Ty*}
-	\circuititembip{stroke thyristor}{Stroke thyristor}{Ty-}
-\end{itemize}
-See chapter \ref{bipole-naming} for information how access the third connector
+\begin{groupdesc}
+    \circuitdescbip*{varistor}{Varistor}{}
+    \circuitdescbip*[photoresistor]{phR}{Photoresistor}{photoresistor}
+    \circuitdescbip{thermocouple}{Thermocouple}{}
+    \circuitdescbip*[thermistor]{thR}{Thermistor}{thermistor}
+    \circuitdescbip*[thermistorptc]{thRp}{PTC thermistor}{thermistor ptc}
+    \circuitdescbip*[thermistorntc]{thRn}{NTC thermistor}{thermistor ntc}
+    \circuitdescbip*{fuse}{Fuse}{}
+    \circuitdescbip*{afuse}{Asymmetric fuse}{asymmetric fuse}
+\end{groupdesc}
 
-\begin{framed}
-The package options \texttt{fulldiode}, \texttt{strokediode}, and \texttt{emptydiode} (and the styles \texttt{[full diodes]}, \texttt{[stroke diodes]}, and \texttt{[empty diodes]}) define which shape will be used by abbreviated commands such that \texttt{D}, \texttt{sD}, \texttt{zD}, \texttt{zzD}, \texttt{tD}, \texttt{pD}, \texttt{leD}, \texttt{VC}, \texttt{Ty},\texttt{Tr}(no stroke symbol available!).
-\end{framed}
+\subsubsection{Generic sensors anchors}
+Generic sensors have an extra label to help positioning the type of dependence, if needed:
 
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+   \draw (0,2) to[sR, l=$R$, name=mySR] ++(3,0);
+   \node [font=\tiny, right] at(mySR.label) {-t\si{\degree}};
+   \draw (0,0) to[sL, l=$L$, name=mySL] ++(3,0);
+   \node [draw, circle, inner sep=2pt] at(mySL.label) {};
+\end{circuitikz}
+\end{LTXexample}
 
-\begin{itemize}
-	\circuititembip{squid}{Squid}{}
-	\circuititembip{barrier}{Barrier}{}
-\end{itemize}
+The anchor is positioned just on the corner of the segmented line crossing the component.
+
+\subsection{Diodes and such}
+\begin{groupdesc}
+    \circuitdescbip*[emptydiode] {empty diode}{Empty diode}{Do}
+    \circuitdescbip*[emptysdiode]{empty Schottky diode}{Empty Schottky diode}{sDo}
+    \circuitdescbip*[emptyzdiode]{empty Zener diode}{Empty Zener diode}{zDo}
+    \circuitdescbip*[emptyzzdiode]{empty ZZener diode}{Empty ZZener diode}{zzDo}
+    \circuitdescbip*[emptytdiode]{empty tunnel diode}{Empty tunnel diode}{tDo}
+    \circuitdescbip*[emptypdiode]{empty photodiode}{Empty photodiode}{pDo}
+    \circuitdescbip*[emptylediode]{empty led}{Empty led}{leDo}
+    \circuitdescbip*[emptyvarcap]{empty varcap}{Empty varcap}{VCo}
+    \circuitdescbip*[emptybidirectionaldiode]{empty bidirectionaldiode}{Empty bidirectionaldiode}{biDo}
+    \circuitdescbip[fulldiode] {full diode}{Full diode}{D*}
+    \circuitdescbip[fullsdiode]{full Schottky diode}{Full Schottky diode}{sD*}
+    \circuitdescbip[fullzdiode]{full Zener diode}{Full Zener diode}{zD*}
+    \circuitdescbip[fullzzdiode]{full ZZener diode}{Full ZZener diode}{zzD*}
+    \circuitdescbip[fulltdiode]{full tunnel diode}{Full tunnel diode}{tD*}
+    \circuitdescbip[fullpdiode]{full photodiode}{Full photodiode}{pD*}
+    \circuitdescbip[fulllediode]{full led}{Full led}{leD*}
+    \circuitdescbip[fullvarcap]{full varcap}{Full varcap}{VC*}
+    \circuitdescbip[fullbidirectionaldiode]{full bidirectionaldiode}{Full bidirectionaldiode}{biD*}
+\end{groupdesc}
+
+These shapes have no exact node-style counterpart, because the stroke line is built upon the empty variants:
+
+\begin{groupdesc}
+    \circuitdescbip*[emptydiode] {stroke diode}{Stroke diode}{D-}
+    \circuitdescbip*[emptysdiode]{stroke Schottky diode}{Stroke Schottky diode}{sD-}
+    \circuitdescbip*[emptyzdiode]{stroke Zener diode}{Stroke Zener diode}{zD-}
+    \circuitdescbip*[emptyzzdiode]{stroke ZZener diode}{Stroke ZZener diode}{zzD-}
+    \circuitdescbip*[emptytdiode]{stroke tunnel diode}{Stroke tunnel diode}{tD-}
+    \circuitdescbip*[emptypdiode]{stroke photodiode}{Stroke photodiode}{pD-}
+    \circuitdescbip*[emptylediode]{stroke led}{Stroke led}{leD-}
+    \circuitdescbip*[emptyvarcap]{stroke varcap}{Stroke varcap}{VC-}
+\end{groupdesc}
+
+\subsection{Tripole-like diodes}\label{sec:othertrip} The following tripoles are entered with the usual command, of the form
+\begin{groupdesc}
+    \circuitdescbip*[emptytriac]{triac}{Standard triac (shape depends on package option)}{Tr}( G/0/0.3 )
+    \circuitdescbip*[emptytriac]{empty triac}{Empty triac}{Tro}( gate/0/0.3 )
+    \circuitdescbip[fulltriac]{full triac}{Full triac}{Tr*}
+    \circuitdescbip*[emptythyristor]{thyristor}{Standard thyristor (shape depends on package option)}{Ty}
+    \circuitdescbip*[emptythyristor]{empty thyristor}{Empty thyristor}{Tyo}
+    \circuitdescbip[fullthyristor]{full thyristor}{Full thyristor}{Ty*}
+    \circuitdescbip*[emptythyristor]{stroke thyristor}{Stroke thyristor}{Ty-}
+\end{groupdesc}
+
+\subsubsection{Triacs anchors}
+
+When inserting a thrystor, a triac or a potentiometer, one needs to refer to the third node-gate (\texttt{gate} or \texttt{G}) for the former two; wiper (\texttt{wiper} or \texttt{W}) for the latter one. This is done by giving a name to the bipole:
+\label{bipole-naming}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) to[Tr, n=TRI] (2,0)
+        to[pR, n=POT] (4,0);
+  \draw[dashed] (TRI.G) -| (POT.wiper)
+;\end{circuitikz}
+\end{LTXexample}
 
-\begin{itemize}
-	\circuititembip{european gas filled surge arrester}{European gas filled surge arrester}{}
-	\circuititembip{american gas filled surge arrester}{American gas filled surge arrester}{}
-\end{itemize}
 
 \begin{framed}
-If (default behaviour) \texttt{europeangfsurgearrester} option is active (or the style \texttt{[european gas filled surge arrester]} is used), the shorthands \texttt{gas filled surge arrester} and \texttt{gf surge arrester} are equivalent to the european version of the component.
-
-If otherwise \texttt{americangfsurgearrester} option is active (or the style \texttt{[american gas filled surge arrester]} is used), the shorthands the shorthands \texttt{gas filled surge arrester} and \texttt{gf surge arrester} are equivalent to the american version of the component.
+The package options \texttt{fulldiode}, \texttt{strokediode}, and \texttt{emptydiode} (and the styles \texttt{[full diodes]}, \texttt{[stroke diodes]}, and \texttt{[empty diodes]}) define which shape will be used by abbreviated commands such that \texttt{D}, \texttt{sD}, \texttt{zD}, \texttt{zzD}, \texttt{tD}, \texttt{pD}, \texttt{leD}, \texttt{VC}, \texttt{Ty},\texttt{Tr} (no stroke symbol available!).
 \end{framed}
 
-\subsubsection{Basic dynamical bipoles}
-\begin{itemize}
-	\circuititembip{capacitor}{Capacitor}{C}
-	\circuititembip{polar capacitor}{Polar capacitor}{pC}
-	\circuititembip{ecapacitor}{Electrolytic capacitor}{eC,elko}
-	\circuititembip{variable capacitor}{Variable capacitor}{vC}
-	\circuititembip{piezoelectric}{Piezoelectric Element}{PZ}
-\end{itemize}	
+
+\subsection{Basic dynamical bipoles}
+\begin{groupdesc}
+    \circuitdescbip{capacitor}{Capacitor}{C}
+    \circuitdescbip[polarcapacitor]{polar capacitor}{Polar capacitor}{pC}
+    \circuitdescbip*{ecapacitor}{Electrolytic capacitor}{eC,elko}
+    \circuitdescbip[vcapacitor]{variable capacitor}{Variable capacitor}{vC}
+    \circuitdescbip[capacitivesens]{capacitive sensor}{Capacitive sensor}{sC}( label/0/0.3 )
+    \circuitdescbip*{piezoelectric}{Piezoelectric Element}{PZ}
+\end{groupdesc}
 
 If (default behaviour) \texttt{cuteinductors} option is active (or the style \texttt{[cute inductors]} is used), the inductors are displayed as follows:
-\begin{itemize}
-  	\ctikzset{inductor=cute}
-  	\circuititembip{L}{Inductor}{cute inductor}
-	\circuititembip{vL}{Variable inductor}{variable cute inductor}
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{inductor=cute}
+    \circuitdescbip[cuteinductor]{L}{Inductor}{cute inductor}
+    \circuitdescbip[cutechoke]{cute choke}{Choke}{}
+    \circuitdescbip[vcuteinductor]{vL}{Variable inductor}{variable cute inductor}
+    \circuitdescbip[scuteinductor]{sL}{Inductive sensor}{cute inductive sensor}( label/0/0.3 )
+\end{groupdesc}
 
 If \texttt{americaninductors} option is active (or the style \texttt{[american inductors]} is used), the inductors are displayed as follows:
-\begin{itemize}
-  	\ctikzset{inductor=american}
-  	\circuititembip{L}{Inductor}{american inductor}
-	\circuititembip{vL}{Variable inductor}{variable american inductor}
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{inductor=american}
+    \circuitdescbip[americaninductor]{L}{Inductor}{american inductor}
+    \circuitdescbip[vamericaninductor]{vL}{Variable inductor}{variable american inductor}
+    \circuitdescbip[samericaninductor]{sL}{Inductive sensor}{american inductive sensor}( label/0/0.3 )
+\end{groupdesc}
 
 Finally, if \texttt{europeaninductors} option is active (or the style \texttt{[european inductors]} is used), the inductors are displayed as follows:
-\begin{itemize}
-  	\ctikzset{inductor=european}
-  	\circuititembip{L}{Inductor}{european inductor}
-	\circuititembip{vL}{Variable inductor}{variable european inductor}
-\end{itemize}
-
-There is also a transmission line: 
-\begin{itemize}
-\circuititembip{TL}{Transmission line}{transmission line, tline}
-\end{itemize}
-
-\subsubsection{Stationary sources}
-\begin{itemize}
-	\circuititembip{battery}{Battery}{}
-	\circuititembip{battery1}{Single battery cell}{}
-	\circuititembip{battery2}{Single battery cell}{}
-	\circuititembip{european voltage source}{Voltage source (european style)}{}
-	\circuititembip{american voltage source}{Voltage source (american style)}{}
-	\circuititembip{european current source}{Current source (european style)}{}
-	\circuititembip{american current source}{Current source (american style)}{}
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{inductor=european}
+    \circuitdescbip[fullgeneric]{L}{Inductor}{european inductor}
+    \circuitdescbip[tfullgeneric]{vL}{Variable inductor}{variable european inductor}
+    \circuitdescbip[sfullgeneric]{sL}{Inductive sensor}{european inductive sensor}( label/0/0.3 )
+    \ctikzset{inductor=cute} % back to default
+\end{groupdesc}
+
+
+\subsection{Stationary sources}
+\begin{groupdesc}
+    \circuitdescbip{battery}{Battery}{}
+    \circuitdescbip{battery1}{Single battery cell}{}
+    \circuitdescbip{battery2}{Single battery cell}{}
+    \circuitdescbip*[vsource]{european voltage source}{Voltage source (european style)}{}
+    \circuitdescbip*[vsourceC]{cute european voltage source}{Voltage source (cute european style)}{vsourceC, ceV}
+    \circuitdescbip*[vsourceAM]{american voltage source}{Voltage source (american style)}{}
+    \circuitdescbip*[isource]{european current source}{Current source (european style)}{}
+    \circuitdescbip*[isourceC]{cute european current source}{Current source (cute european style)}{isourceC, ceI}
+    \circuitdescbip*[isourceAM]{american current source}{Current source (american style)}{}
+\end{groupdesc}
 
 \begin{framed}
 If (default behaviour) \texttt{europeancurrents} option is active (or the style \texttt{[european currents]} is used), the shorthands \texttt{current source}, \texttt{isource}, and \texttt{I} are equivalent to \texttt{european current source}. Otherwise, if \texttt{americancurrents} option is active (or the style \texttt{[american currents]} is used) they are equivalent to \texttt{american current source}.
@@ -467,120 +1184,346 @@ Similarly, if (default behaviour) \texttt{europeanvoltages} option is active (or
 \end{framed}
 
 
-\subsubsection{Sinusoidal sources} Here because I was asked for them. But how do you distinguish one from the other?!
-\begin{itemize}
-	\circuititembip{sinusoidal voltage source}{Sinusoidal voltage source}{vsourcesin, sV}
-	\circuititembip{sinusoidal current source}{Sinusoidal current source}{isourcesin, sI}
-\end{itemize}
+\subsection{Sinusoidal sources} Here because I was asked for them. But how do you distinguish one from the other?!
+\begin{groupdesc}
+    \circuitdescbip*[vsourcesin]{sinusoidal voltage source}{Sinusoidal voltage source}{vsourcesin, sV}
+    \circuitdescbip*[isourcesin]{sinusoidal current source}{Sinusoidal current source}{isourcesin, sI}
+\end{groupdesc}
 
-\subsubsection{Special sources}
-\begin{itemize}
-	\circuititembip{square voltage source}{Square voltage source}{vsourcesquare, sqV}
-	\circuititembip{vsourcetri}{Triangle voltage source}{tV}
-	\circuititembip{esource}{Empty voltage source}{}
-	\circuititembip{pvsource}{Photovoltaic-voltage source}{}
-	\circuititembip{ioosource}{Double Zero style current source}{}
-	\circuititembip{voosource}{Double Zero style voltage source}{}
-\end{itemize}
+\subsection{Controlled sources}
+\begin{groupdesc}
+    \circuitdescbip*[cvsource]{european controlled voltage source}{Controlled voltage source (european style)}{}
+    \circuitdescbip*[cvsourceC]{cute european controlled voltage source}{Voltage source (cute european style)}{cvsourceC, cceV}
+    \circuitdescbip*[cvsourceAM]{american controlled voltage source}{Controlled voltage source (american style)}{}
+    \circuitdescbip*[cisource]{european controlled current source}{Controlled current source (european style)}{}
+    \circuitdescbip*[cisourceC]{cute european controlled current source}{Current source (cute european style)}{cisourceC, cceI}
+    \circuitdescbip*[cisourceAM]{american controlled current source}{Controlled current source (american style)}{}
+\end{groupdesc}
 
-\subsubsection{DC sources}
-\begin{itemize}
-	\circuititembip{dcvsource}{DC voltage source}{}
-	\circuititembip{dcisource}{DC current source}{}
-\end{itemize}
+\begin{framed}
+If (default behaviour) \texttt{europeancurrents} option is active (or the style \texttt{[european currents]} is used), the shorthands \texttt{controlled current source}, \texttt{cisource}, and \texttt{cI} are equivalent to \texttt{european controlled current source}. Otherwise, if \texttt{americancurrents} option is active (or the style \texttt{[american currents]} is used) they are equivalent to \texttt{american controlled current source}.
 
-\subsubsection{Mechanical Analogy}
-\begin{itemize}
-	\circuititembip{damper}{Mechanical Damping}{}
-	\circuititembip{spring}{Mechanical Stiffness}{}
-	\circuititembip{mass}{Mechanical Mass}{}	
-\end{itemize}
+Similarly, if (default behaviour) \texttt{europeanvoltages} option is active (or the style \texttt{[european voltages]} is used), the shorthands \texttt{controlled voltage source}, \texttt{cvsource}, and \texttt{cV} are equivalent to \texttt{european controlled voltage source}. Otherwise, if \texttt{americanvoltages} option is active (or the style \texttt{[american voltages]} is used) they are equivalent to \texttt{american controlled voltage source}.
+\end{framed}
 
-\subsubsection{Switch}
-\begin{itemize}
-	\circuititembip{switch}{Switch}{spst}
-	\circuititembip{closing switch}{Closing switch}{cspst}
-	\circuititembip{opening switch}{Opening switch}{ospst}
-	\circuititembip{normal open switch}{Normally open switch}{nos}
-	\circuititembip{normal closed switch}{Normally closed switch}{ncs}
-	\circuititembip{push button}{Push button}{}
-\end{itemize}	
-
-\subsubsection{Block diagram components}
-\noindent Contributed by Stefan Erhardt.
-\begin{itemize}
-	\circuititembip{twoport}{generic two port\footnote{To specify text to be put in the component: \texttt{twoport[t=text]}): \tikz \draw[scale=.5, transform shape] (0,0) to[twoport,>,t=text] (2,0); }}{}
-	\circuititembip{vco}{vco}{}
-	\circuititembip{bandpass}{bandpass}{}
-	\circuititembip{bandstop}{bandstop}{}
-	\circuititembip{highpass}{highpass}{}
-	\circuititembip{lowpass}{lowpass}{}
-	\circuititembip{adc}{A/D converter}{}
-	\circuititembip{dac}{D/A converter}{}
-	\circuititembip{dsp}{DSP}{}
-	\circuititembip{fft}{FFT}{}
-	\circuititembip{amp}{amplifier}{}
-	\circuititembip{vamp}{VGA}{}
-	\circuititembip{piattenuator}{$\pi$ attenuator}{}
-	\circuititembip{vpiattenuator}{var. $\pi$ attenuator}{}
-	\circuititembip{tattenuator}{T attenuator}{}
-	\circuititembip{vtattenuator}{var.\ T attenuator}{}
-	\circuititembip{phaseshifter}{phase shifter}{}
-	\circuititembip{vphaseshifter}{var.\ phase shifter}{}
-	\circuititembip{detector}{detector}{}
-\end{itemize}	
-
-
-
-
-\subsection{Tripoles}
-\subsubsection{Controlled sources} Admittedly, graphically they are bipoles. But I couldn't\ldots
-\begin{itemize}
-	\circuititembip{european controlled voltage source}{Controlled voltage source (european style)}{}
-	\circuititembip{american controlled voltage source}{Controlled voltage source (american style)}{}
-	\circuititembip{european controlled current source}{Controlled current source (european style)}{}
-	\circuititembip{american controlled current source}{Controlled current source (american style)}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdescbip*[cvsourcesin]{controlled sinusoidal voltage source}{Controlled sinusoidal voltage source}{controlled vsourcesin, cvsourcesin, csV}
+    \circuitdescbip*[cisourcesin]{controlled sinusoidal current source}{Controlled sinusoidal current source}{controlled isourcesin, cisourcesin, csI}
+\end{groupdesc}
+
+
+
+\subsection{Noise sources}
+
+In this case, the ``direction''  of the source has no sense. Noise sources are filled in gray by default, but if you choose the dashed style, they become fillable.
+
+\begin{groupdesc}
+    \circuitdescbip[vsourceN]{noise voltage source}{Sinusoidal voltage source}{vsourceN, nV}
+    \circuitdescbip[isourceN]{noise current source}{Sinusoidal current source}{isourceN, nI}
+\end{groupdesc}
+
+You can change the fill color with the key \texttt{circuitikz/bipoles/noise sources/fillcolor}:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw(0,0) to [nV, l=$e_n$] ++(2,0);
+    \draw(0,-2) to [nI, l=$i_n$] ++(2,0);
+    \begin{scope}[circuitikz/bipoles/noise sources/fillcolor=red!50]
+        \draw(3,0) to [nV, l=$e_n$] ++(2,0);
+        \draw(3,-2) to [nI, l=$i_n$] ++(2,0);
+    \end{scope}
+\end{circuitikz}
+\end{LTXexample}
+
+If you prefer a patterned noise generator (similar to the one you draw by hand) you can use the fake color \texttt{dashed}:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw(0,0) to [nV, l=$e_n$] ++(2,0);
+    \draw(0,-2) to [nI, l=$i_n$] ++(2,0);
+    \begin{scope}[circuitikz/bipoles/noise sources/fillcolor=dashed]
+        \draw(3,0) to [nV, l=$e_n$] ++(2,0);
+        \draw(3,-2) to [nI, l=$i_n$] ++(2,0);
+    \end{scope}
+\end{circuitikz}
+\end{LTXexample}
+
+Notice that if you choose the dashed style, the noise sources are fillable:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{bipoles/noise sources/fillcolor=dashed}
+    \draw(0,0) to [nV, l=$e_n$] ++(2,0);
+    \draw(0,-2) to [nI, l=$i_n$] ++(2,0);
+    \begin{scope}
+        \draw(3,0) to [nV, l=$e_n$, fill=yellow!50!red] ++(2,0);
+        \draw(3,-2) to [nI, l=$i_n$, fill=blue!50!white] ++(2,0);
+    \end{scope}
+\end{circuitikz}
+\end{LTXexample}
+
+\subsection{Special sources}
+\begin{groupdesc}
+    \circuitdescbip*[vsourcesquare]{square voltage source}{Square voltage source}{vsourcesquare, sqV}
+    \circuitdescbip*{vsourcetri}{Triangle voltage source}{tV}
+    \circuitdescbip*{esource}{Empty voltage source}{}
+    \circuitdescbip*{pvsource}{Photovoltaic-voltage source}{}
+    \circuitdescbip*[oosource]{ioosource}{Double Zero style current source}{}
+    \circuitdescbip*[oosource]{voosource}{Double Zero style voltage source}{}
+\end{groupdesc}
+
+\subsection{DC sources}
+\begin{groupdesc}
+    \circuitdescbip*{dcvsource}{DC voltage source}{}
+    \circuitdescbip*{dcisource}{DC current source}{}
+\end{groupdesc}
+
+\subsection{Mechanical Analogy}
+\begin{groupdesc}
+    \circuitdescbip*{damper}{Mechanical Damping}{}
+    \circuitdescbip{spring}{Mechanical Stiffness}{}
+    \circuitdescbip*{viscoe}{Mechanical viscoelastic element\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \footnotetext{Suggested by @Alex in \url{https://tex.stackexchange.com/q/484268/38080}}
+    \circuitdescbip*{mass}{Mechanical Mass}{}
+\end{groupdesc}
+
+\subsection{Other bipoles}
+
+Here you'll find bipoles that are not easily grouped in the categories above.
+
+\begin{groupdesc}
+    \circuitdescbip{squid}{Squid}{}
+    \circuitdescbip{barrier}{Barrier}{}
+\end{groupdesc}
+
+\begin{groupdesc}
+    \circuitdescbip*{european gas filled surge arrester}{European gas filled surge arrester}{}
+    \circuitdescbip*{american gas filled surge arrester}{American gas filled surge arrester}{}
+\end{groupdesc}
 
 \begin{framed}
-If (default behaviour) \texttt{europeancurrents} option is active (or the style \texttt{[european currents]} is used), the shorthands \texttt{controlled current source}, \texttt{cisource}, and \texttt{cI} are equivalent to \texttt{european controlled current source}. Otherwise, if \texttt{americancurrents} option is active (or the style \texttt{[american currents]} is used) they are equivalent to \texttt{american controlled current source}.
+If (default behaviour) \texttt{europeangfsurgearrester} option is active (or the style \texttt{[european gas filled surge arrester]} is used), the shorthands \texttt{gas filled surge arrester} and \texttt{gf surge arrester} are equivalent to the european version of the component.
 
-Similarly, if (default behaviour) \texttt{europeanvoltages} option is active (or the style \texttt{[european voltages]} is used), the shorthands \texttt{controlled voltage source}, \texttt{cvsource}, and \texttt{cV} are equivalent to \texttt{european controlled voltage source}. Otherwise, if \texttt{americanvoltages} option is active (or the style \texttt{[american voltages]} is used) they are equivalent to \texttt{american controlled voltage source}.
+If otherwise \texttt{americangfsurgearrester} option is active (or the style \texttt{[american gas filled surge arrester]} is used), the shorthands the shorthands \texttt{gas filled surge arrester} and \texttt{gf surge arrester} are equivalent to the american version of the component.
 \end{framed}
 
-\begin{itemize}
-	\circuititembip{controlled sinusoidal voltage source}{Controlled sinusoidal voltage source}{controlled vsourcesin, cvsourcesin, csV}
-	\circuititembip{controlled sinusoidal current source}{Controlled sinusoidal current source}{controlled isourcesin, cisourcesin, csI}
-	\end{itemize}
 
 
-\subsubsection{Transistors} 
+\begin{groupdesc}
+    \circuitdescbip*{lamp}{Lamp}{}
+    \circuitdescbip*{bulb}{Bulb}{}
+    \circuitdescbip*{loudspeaker}{loudspeaker}{}( north/90/0.4, north east/45/0.4, east/0/0.4, south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4,
+    left/135/0.2, right/45/0.2, center/-135/0.2
+    )
+   \circuitdescbip*{mic}{mic}{}( north/90/0.4, north east/45/0.4, east/0/0.4, south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4,
+    left/135/0.2, right/45/0.2, center/-135/0.2
+    )
+\end{groupdesc}
+
+You can use microphones and loudspeakers with \texttt{waves} (see section~\ref{sec:support}) too:
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}
+        \draw (0,0) to[mic, name=M] ++(0,2)
+        to[amp, t=$A$] ++(2,0)
+        to[loudspeaker, name=L] ++(0,-2)
+        to[short, -*] (0,0) node[ground]{};
+        \node [waves, scale=0.7, left=5pt]
+            at(M.north) {};
+        \node [waves, scale=0.7, right]
+            at(L.north) {};
+    \end{circuitikz}
+\end{LTXexample}
 
-\begin{itemize}
-	\circuititem{nmos}{\scshape nmos}{}
-	\circuititem{pmos}{\scshape pmos}{}
-	\circuititem{npn}{\scshape npn}{}
-	\circuititem{pnp}{\scshape pnp}{}
-	\circuititem{npn,photo}{\scshape npn}{}
-	\circuititem{pnp,photo}{\scshape pnp}{}
-	\circuititem{nigbt}{\scshape nigbt}{}
-	\circuititem{pigbt}{\scshape pigbt}{}
-	\circuititem{Lnigbt}{\scshape Lnigbt}{}
-	\circuititem{Lpigbt}{\scshape Lpigbt}{}
-\end{itemize}
 
-For all transistors a bodydiode(or freewheeling diode) can automatically be drawn. Just use the global option bodydiode, or for single transistors, the tikz-option bodydiode:
+\subsection{Block diagram components}
+\noindent Contributed by Stefan Erhardt.
+
+\begin{groupdesc}
+    \circuitdesc*{mixer}{\scshape mixer}{}( 1/180/0.1,2/-90/0.1,3/0/0.1,4/90/0.1 )
+    \circuitdesc*{adder}{\scshape adder}{}( west/180/0.1,south/-90/0.1,east/0/0.1,north/90/0.1 )
+    \circuitdesc*{oscillator}{\scshape oscillator}{}
+    \circuitdesc*{circulator}{\scshape circulator}{}
+    \circuitdesc*{wilkinson}{\scshape wilkinson divider}{}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
+\end{groupdesc}
+
+\begin{groupdesc}
+    \circuitdescbip*{twoport}{generic two port\footnotemark}{}
+    \footnotetext{To specify text to be put in the component: \texttt{twoport[t=text]}): \tikz \draw[scale=.5, transform shape] (0,0) to[twoport,>,t=text] (2,0); }
+    \circuitdescbip*{vco}{vco}{}
+    \circuitdescbip*{bandpass}{bandpass}{}
+    \circuitdescbip*{bandstop}{bandstop}{}
+    \circuitdescbip*{highpass}{highpass}{}
+    \circuitdescbip*{lowpass}{lowpass}{}
+    \circuitdescbip*{adc}{A/D converter}{}
+    \circuitdescbip*{dac}{D/A converter}{}
+    \circuitdescbip*{dsp}{DSP}{}
+    \circuitdescbip*{fft}{FFT}{}
+    \circuitdescbip*{amp}{amplifier}{}
+    \circuitdescbip*{vamp}{VGA}{}
+    \circuitdescbip*{piattenuator}{$\pi$ attenuator}{}
+    \circuitdescbip*{vpiattenuator}{var. $\pi$ attenuator}{}
+    \circuitdescbip*{tattenuator}{T attenuator}{}
+    \circuitdescbip*{vtattenuator}{var.\ T attenuator}{}
+    \circuitdescbip*{phaseshifter}{phase shifter}{}
+    \circuitdescbip*{vphaseshifter}{var.\ phase shifter}{}
+    \circuitdescbip*{detector}{detector}{}
+\end{groupdesc}
+
+\begin{groupdesc}
+    \circuitdesc{coupler}{Coupler}{}
+    \circuitdesc{coupler2}{Coupler, 2}{}
+\end{groupdesc}
+
+\subsubsection{Blocks anchors}
+
+The ports of the mixer and adder can be addressed with numbers or \texttt{west}/\texttt{south}/\texttt{east}/\texttt{north}:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[mixer] (mix) {}
+  (mix.1) node[left] {1}
+  (mix.2) node[below] {2}
+  (mix.3) node[right] {3}
+  (mix.4) node[above] {4}
+;\end{circuitikz}
+\end{LTXexample}
+
+
+The Wilkinson divider has:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[wilkinson] (w) {\SI{3}{dB}}
+  (w.in) to[short,-o] ++(-0.5,0)
+  (w.out1) to[short,-o] ++(0.5,0)
+  (w.out2) to[short,-o] ++(0.5,0)
+  (w.in) node[below left] {\texttt{in}}
+  (w.out1) node[below right] {\texttt{out1}}
+  (w.out2) node[above right] {\texttt{out2}}
+  ;
+\end{circuitikz}
+\end{LTXexample}
+
+The couplers have:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[coupler] (c) {\SI{10}{dB}}
+  (c.1) to[short,-o] ++(-0.5,0)
+  (c.2) to[short,-o] ++(0.5,0)
+  (c.3) to[short,-o] ++(0.5,0)
+  (c.4) to[short,-o] ++(-0.5,0)
+  (c.1) node[below left] {\texttt{1}}
+  (c.2) node[below right] {\texttt{2}}
+  (c.3) node[above right] {\texttt{3}}
+  (c.4) node[above left] {\texttt{4}}
+  ;
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[coupler2] (c) {\SI{3}{dB}}
+  (c.1) to[short,-o] ++(-0.5,0)
+  (c.2) to[short,-o] ++(0.5,0)
+  (c.3) to[short,-o] ++(0.5,0)
+  (c.4) to[short,-o] ++(-0.5,0)
+  (c.1) node[below left] {\texttt{1}}
+  (c.2) node[below right] {\texttt{2}}
+  (c.3) node[above right] {\texttt{3}}
+  (c.4) node[above left] {\texttt{4}}
+  ;
+\end{circuitikz}
+\end{LTXexample}
+
+
+\subsubsection{Blocks customization}
+
+With the option \texttt{>} you can draw an arrow to the input of the block diagram symbols.
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) to[short,o-] ++(0.3,0)
+  to[lowpass,>] ++(2,0)
+  to[adc,>] ++(2,0)
+  to[short,-o] ++(0.3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+
+\paragraph{Multi ports}
+Since inputs and outputs can vary, input arrows can be placed as nodes. Note that you have to rotate the arrow on your own:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[mixer] (m) {}
+  (m.1) to[short,-o] ++(-1,0)
+  (m.2) to[short,-o] ++(0,-1)
+  (m.3) to[short,-o] ++(1,0)
+  (m.1) node[inputarrow] {}
+  (m.2) node[inputarrow,rotate=90] {};
+\end{circuitikz}
+\end{LTXexample}
+
+
+\paragraph{Labels and custom two-port boxes}
+Some two-ports have the option to place a normal label (\texttt{l=}) and a inner label (\texttt{t=}).
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
-   \draw (0,0) node[npn,bodydiode](npn){}++(2,0)node[pnp,bodydiode](npn){};
-   \draw (0,-2) node[nigbt,bodydiode](npn){}++(2,0)node[pigbt,bodydiode](npn){};
-   \draw (0,-4) node[nfet,bodydiode](npn){}++(2,0)node[pfet,bodydiode](npn){};
+  \ctikzset{bipoles/amp/width=0.9}
+  \draw (0,0) to[amp,t=LNA,l_=$F{=}0.9\,$dB,o-o] ++(3,0);
+\end{circuitikz}
+\end{LTXexample}
+
+
+\paragraph{Box option}
+Some devices have the possibility to add a box around them. The inner symbol scales down to fit inside the box.
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[mixer,box,anchor=east] (m) {}
+    to[amp,box,>,-o] ++(2.5,0)
+  (m.west) node[inputarrow] {} to[short,-o] ++(-0.8,0)
+  (m.south) node[inputarrow,rotate=90] {} --
+    ++(0,-0.7) node[oscillator,box,anchor=north] {};
+\end{circuitikz}
+\end{LTXexample}
+
+
+\paragraph{Dash optional parts}
+To show that a device is optional, you can dash it. The inner symbol will be kept with solid lines.
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+  \draw (0,0) to[amp,l=\SI{10}{dB}] ++(2.5,0);
+  \draw[dashed] (2.5,0) to[lowpass,l=opt.] ++(2.5,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 
 
+\subsection{Transistors}
 
+\begin{groupdesc}
+    \circuitdesc{nmos}{\scshape nmos}{}( G/180/0.2,D/0/0.2,S/0/0.2 )
+    \circuitdesc{pmos}{\scshape pmos}{}
+    \circuitdesc{hemt}{\scshape hemt}{}
+    \circuitdesc{npn}{\scshape npn}{}( B/180/0.2,C/0/0.2,E/0/0.2 )
+    \circuitdesc{pnp}{\scshape pnp}{}
+    \circuitdesc{npn,photo}{\scshape npn}{}( nobase/0/0.4 )
+    \circuitdesc{pnp,photo}{\scshape pnp}{}
+    \circuitdesc{nigbt}{\scshape nigbt}{}
+    \circuitdesc{pigbt}{\scshape pigbt}{}
+    \circuitdesc{Lnigbt}{\scshape Lnigbt}{}
+    \circuitdesc{Lpigbt}{\scshape Lpigbt}{}
+\end{groupdesc}
+
+For all transistors a body diode (or freewheeling diode) can automatically be drawn. Just use the global option bodydiode, or for single transistors, the tikz-option bodydiode:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+   \draw (0,0) node[npn,bodydiode](npn){}++(2,0)node[pnp,bodydiode](npn){};
+   \draw (0,-2) node[nigbt,bodydiode](npn){}++(2,0)node[pigbt,bodydiode](npn){};
+   \draw (0,-4) node[nfet,bodydiode](npn){}++(2,0)node[pfet,bodydiode](npn){};
+\end{circuitikz}
+\end{LTXexample}
 
 The Base/Gate connection of all transistors can be disable by using the options \textit{nogate} or \textit{nobase}, respectively. The Base/Gate anchors are floating, but there an additional anchor "nogate"/"nobase", which can be used to point to the unconnected base:
 \begin{LTXexample}[varwidth=true]
@@ -591,54 +1534,178 @@ The Base/Gate connection of all transistors can be disable by using the options
    \draw (npn.B) node[circ]{} node[left]{B};
    \draw[dashed,red,-latex] (1,0.5)--(npn.nobase);
 \end{circuitikz}
-\end{LTXexample}	
-
-
+\end{LTXexample}
 
 If the option \texttt{arrowmos} is used (or after the command \verb!\ctikzset{tripoles/mos style/arrows}! is given), this is the output:
 \ctikzset{tripoles/mos style/arrows}
-\begin{itemize}
-	\circuititem{nmos}{\scshape nmos}{}
-	\circuititem{pmos}{\scshape pmos}{}
-\end{itemize}
+\begin{groupdesc}
+	\circuitdesc{nmos}{\scshape nmos}{}
+	\circuitdesc{pmos}{\scshape pmos}{}
+\end{groupdesc}
 \ctikzset{tripoles/mos style/no arrows}
+To draw the PMOS circle non-solid, use the option \texttt{emptycircle} or the command
+\\\verb!\ctikzset{tripoles/pmos style/emptycircle}!.
 
-To draw the PMOS circle non-solid, use the option \texttt{emptycircle} or the command \verb!\ctikzset{tripoles/pmos style/emptycircle}!.
-\begin{itemize}
-	\circuititem{pmos,emptycircle}{\scshape pmos}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc{pmos,emptycircle}{\scshape pmos}{}
+\end{groupdesc}
 
-\textsc{nfet}s and \textsc{pfet}s have been incorporated based on code provided by Clemens Helfmeier and Theodor 
-Borsche. Use the package options \texttt{fetsolderdot}/\texttt{nofetsolderdot} to enable/disable solderdot at some fet-transistors. Additionally, the solderdot option can be enabled/disabled for single transistors with the option "solderdot" and "nosolderdot", respectively.
+If you prefer different position of the arrows in transistors and FETs, you can adjust them like this (it works for the other BJT-based transistors, too):
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{tripoles/mos style/arrows,
+    tripoles/npn/arrow pos=0.8,
+    tripoles/pnp/arrow pos=0.8,
+    tripoles/nmos/arrow pos=0.8,
+    tripoles/pmos/arrow pos=0.6, }
+   \draw (0,0) node[npn, ](npn){};
+   \draw (2,0) node[pnp, ](npn){};
+   \draw (0,-2) node[nmos, ](npn){};
+   \draw (2,-2) node[pmos, ](npn){};
+\end{circuitikz}
+\end{LTXexample}
 
+\textsc{nfet}s and \textsc{pfet}s have been incorporated based on code provided by Clemens Helfmeier and Theodor
+Borsche. Use the package options \texttt{fetsolderdot}/\texttt{nofetsolderdot} to enable/disable solderdot at some fet-transistors. Additionally, the solderdot option can be enabled/disabled for single transistors with the option "solderdot" and "nosolderdot", respectively.
 
-\begin{itemize}
-	\circuititem{nfet}{\scshape nfet}{}
-	\circuititem{nigfete}{\scshape nigfete}{}
-	\circuititem{nigfete,solderdot}{\scshape nigfete}{}
-	\circuititem{nigfetebulk}{\scshape nigfetebulk}{}
-	\circuititem{nigfetd}{\scshape nigfetd}{}
-	\circuititem{pfet}{\scshape pfet}{}
-	\circuititem{pigfete}{\scshape pigfete}{}
-	\circuititem{pigfetebulk}{\scshape pigfetebulk}{}
-	\circuititem{pigfetd}{\scshape pigfetd}{}
-\end{itemize}
 
-\textsc{njfet} and \textsc{pjfet} have been incorporated based on code provided by Danilo Piazzalunga: 
-\begin{itemize}
-	\circuititem{njfet}{\scshape njfet}{}
-	\circuititem{pjfet}{\scshape pjfet}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc{nfet}{\scshape nfet}{}
+    \circuitdesc{nigfete}{\scshape nigfete}{}
+    \circuitdesc{nigfete,solderdot}{\scshape nigfete}{}
+    \circuitdesc{nigfetebulk}{\scshape nigfetebulk}{}
+    \circuitdesc{nigfetd}{\scshape nigfetd}{}
+    \circuitdesc{pfet}{\scshape pfet}{}
+    \circuitdesc{pigfete}{\scshape pigfete}{}
+    \circuitdesc{pigfetebulk}{\scshape pigfetebulk}{}
+    \circuitdesc{pigfetd}{\scshape pigfetd}{}
+\end{groupdesc}
+
+\textsc{njfet} and \textsc{pjfet} have been incorporated based on code provided by Danilo Piazzalunga:
+\begin{groupdesc}
+    \circuitdesc{njfet}{\scshape njfet}{}
+    \circuitdesc{pjfet}{\scshape pjfet}{}
+\end{groupdesc}
 
 \textsc{isfet}
-\begin{itemize}
-	\circuititem{isfet}{\scshape isfet}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc{isfet}{\scshape isfet}{}
+\end{groupdesc}
 
-\subsubsection{Electronic Tubes}
-\begin{itemize}
-	\circuititem{magnetron}{Magnetron}{}
-\end{itemize}
+\subsubsection{Transistors anchors}
+
+For \textsc{nmos}, \textsc{pmos}, \textsc{nfet}, \textsc{nigfete}, \textsc{nigfetd}, \textsc{pfet}, \textsc{pigfete}, and \textsc{pigfetd}  transistors  one has \texttt{base}, \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with \texttt{B}, \texttt{G}, \texttt{S} and \texttt{D}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[nmos] (mos)  {}
+  (mos.gate) node[anchor=east] {G}
+  (mos.drain) node[anchor=south] {D}
+  (mos.source) node[anchor=north] {S}
+;\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pigfete] (pigfete)  {}
+  (pigfete.G) node[anchor=east] {G}
+  (pigfete.D) node[anchor=north] {D}
+  (pigfete.S) node[anchor=south] {S}
+  (pigfete.bulk) node[anchor=west] {Bulk}
+;\end{circuitikz}
+\end{LTXexample}
+
+Similarly \textsc{njfet} and \textsc{pjfet} have  \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with  \texttt{G}, \texttt{S} and \texttt{D}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pjfet] (pjfet)  {}
+  (pjfet.G) node[anchor=east] {G}
+  (pjfet.D) node[anchor=north] {D}
+  (pjfet.S) node[anchor=south] {S}
+;\end{circuitikz}
+\end{LTXexample}
+
+For \textsc{npn}, \textsc{pnp}, \textsc{nigbt}, and \textsc{pigbt} transistors the anchors are  \texttt{base}, \texttt{emitter} and \texttt{collector} anchors (which can be abbreviated with \texttt{B}, \texttt{E} and \texttt{C}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[npn] (npn)  {}
+  (npn.base) node[anchor=east] {B}
+  (npn.collector) node[anchor=south] {C}
+  (npn.emitter) node[anchor=north] {E}
+;\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pigbt] (pigbt)  {}
+  (pigbt.B) node[anchor=east] {B}
+  (pigbt.C) node[anchor=north] {C}
+  (pigbt.E) node[anchor=south] {E}
+;\end{circuitikz}
+\end{LTXexample}
+
+Here is one composite example (please notice that the \texttt{xscale=-1} style would also reflect the label of the transistors, so here a new node is added and its text is used, instead of that of \texttt{pnp1}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pnp] (pnp2) {2}
+  (pnp2.B) node[pnp, xscale=-1, anchor=B] (pnp1) {}
+    (pnp1) node {1}
+  (pnp1.C) node[npn, anchor=C] (npn1) {}
+  (pnp2.C) node[npn, xscale=-1, anchor=C] (npn2) {}
+  (pnp1.E) -- (pnp2.E)  (npn1.E) -- (npn2.E)
+  (pnp1.B) node[circ] {} |- (pnp2.C) node[circ] {}
+;\end{circuitikz}
+\end{LTXexample}
+
+Notice that the text labels of transistors are somewhat buggy. It is better to se explicit anchors to set transistor's names.
+
+Similarly, transistors like other components can be reflected vertically:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pigfete, yscale=-1] (pigfete)  {}
+  (pigfete.bulk) node[anchor=west] {Bulk}
+  (pigfete.G) node[anchor=east] {G}
+  (pigfete.D) node[anchor=south] {D}
+  (pigfete.S) node[anchor=north] {S}
+;\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Transistor paths}\label{sec:transasbip}
+
+For syntactical convenience transistors can be placed using the normal path notation used for bipoles. The transitor type can be specified by  simply adding a ``T'' (for transistor) in front of the node name of the transistor. It will be placed with the base/gate orthogonal to the direction of the path:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[njfet] {1}
+  (-1,2) to[Tnjfet=2] (1,2)
+    to[Tnjfet=3, mirror] (3,2);
+;\end{circuitikz}
+\end{LTXexample}
+
+Access to the gate and/or base nodes can be gained by naming the transistors with the \texttt{n} or \texttt{name} path style:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw[yscale=1.1, xscale=.8]
+  (2,4.5) -- (0,4.5) to[Tpmos, n=p1] (0,3)
+     to[Tnmos, n=n1] (0,1.5)
+     to[Tnmos, n=n2] (0,0) node[ground] {}
+  (2,4.5) to[Tpmos,n=p2] (2,3) to[short, -*] (0,3)
+  (p1.G) -- (n1.G) to[short, *-o] ($(n1.G)+(3,0)$)
+  (n2.G) ++(2,0) node[circ] {} -| (p2.G)
+  (n2.G) to[short, -o] ($(n2.G)+(3,0)$)
+  (0,3) to[short, -o] (-1,3)
+;\end{circuitikz}
+\end{LTXexample}
+
+The \texttt{name} property is available also for bipoles, although this is useful mostly for triac, potentiometer and thyristor (see~\ref{sec:othertrip}).
+
+
+\subsection{Electronic Tubes}
+\begin{groupdesc}
+    \circuitdesc*{magnetron}{Magnetron}{}( anode/-90/0.2, cathode1/135/0.2,
+    cathode2/45/0.2, left/180/0.2, right/0/0.2, top/90/0.4 )
+\end{groupdesc}
 \begin{LTXexample}[varwidth=true]
 	\begin{circuitikz}
 	\draw (0,-2)node[rground](gnd){} to[voltage source,v<={HV}]++(0,3)--++(1,0)to[V,n=DC]++(2,0);
@@ -646,37 +1713,64 @@ Borsche. Use the package options \texttt{fetsolderdot}/\texttt{nofetsolderdot} t
 	\draw (DC.left)++(-0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode1);
 	\draw (DC.right)++(0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode2);
 	\draw (magn.anode) to [short] (magn.anode|-gnd) node[rground]{};
-	\draw (magn.cathode1)node[above]{$1$}; 
+	\draw (magn.cathode1)node[above]{$1$};
 	\draw (magn.cathode2)node[above]{$2$};
 	\draw[->](magn.east) --++(1,0)node[right]{$RF_{out}$};
 	\end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
-\subsubsection{Block diagram}
-These come from Stefan Erhardt's contribution of block diagram components. Add a box around them with the option \texttt{box}.
-\begin{itemize}
-	\circuititem{mixer}{\scshape mixer}{}
-	\circuititem{adder}{\scshape adder}{}
-	\circuititem{oscillator}{\scshape oscillator}{}
-	\circuititem{circulator}{\scshape circulator}{}
-	\circuititem{wilkinson}{\scshape wilkinson divider}{}
-	%\circuititem{coupler}{\scshape coupler}{}
-	%\circuititem{coupler2}{\scshape coupler2}{}
-\end{itemize}
+\subsection{RF components}
 
+For the RF components, similarly to the grounds and supply rails, the \texttt{center} anchor is put on the connecting point of the symbol, so that you can use them directly in a \texttt{path} specification.
 
-		
-\subsubsection{Switch}
-\begin{itemize}
-	\circuititem{spdt}{\scshape spdt}{}
-	\circuititembip{toggle switch}{Toggle switch}{}
-\end{itemize}
+Notes that in the transmission and receiving antennas, the ``waves'' are outside the geographical anchors.
 
-\subsubsection{Electro-Mechanical Devices}
-\begin{itemize}
-	\circuititem{elmech}{\scshape Motor}{M}
-	\circuititem{elmech}{\scshape Generator}{G}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc*{bareantenna}{Bare Antenna}{A}( top/90/0.1, bottom/180/0.3, left/180/0.3, right/45/0.3, center/0/0.3 )
+    \circuitdesc*{bareTXantenna}{Bare TX Antenna}{Tx}( top/90/0.1, center/180/0.3, waves/90/0.3 )
+    \circuitdesc*{bareRXantenna}{Bare RX Antenna}{Rx}( top/90/0.1, center/0/0.3, waves/90/0.3 )
+    \circuitdescbip*{mstline}{Microstrip transmission line\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+    \circuitdesc*{mslstub}{Microstrip stub}{text}(left/135/0.2, right/45/0.2, center/-45/0.3)
+    \circuitdesc*{msport}{Microstrip port}{T}(left/135/0.2, right/45/0.2, center/-45/0.3)
+    \circuitdesc*{msrstub}{Microstrip radial stub}{}(left/135/0.2, right/45/0.2, center/-45/0.3)
+    \footnotetext{This four components were suggested by \texttt{@tcpluess} on GitHub}
+    \circuitdesc{antenna}{Antenna}{}( center/0/0.3 )
+    \circuitdesc{rxantenna}{Receiving antenna}{}
+    \circuitdesc{txantenna}{Transmitting antenna}{}
+    \circuitdesc*{tlinestub}{Transmission line stub}{}
+    \circuitdescbip*[tline]{TL}{Transmission line}{transmission line, tline}
+    \circuitdesc{match}{match}{}
+\end{groupdesc}
+
+
+\subsubsection{Microstrip customization}
+
+The microstrip linear components' (\texttt{mstline}, \texttt{mslstub}, \texttt{msport}) heights depend on the parameters \texttt{bipoles/mstline/height} (for the three of them, default 0.3). The widths are specified in \texttt{bipoles/mstline/width} for the first two and by \texttt{monopoles/msport/width} for the port (defaults: 1.2, 0.5).
+
+For the length parameter of the transmission line there is a shortcut in the form of the direct parameter \texttt{mstlinelen}.
+
+\begin{LTXexample}[varwidth=true, pos=t]
+\begin{circuitikz}
+    \draw (0,0) node[msport, right, xscale=-1]{}
+    to[mstline, -o]  ++(3,0) coordinate(there)
+    to[mstline, mstlinelen=2, l=longer, o-*]  ++(4,0)
+        coordinate(here) -- ++(0.5,0) node[mslstub, fill=yellow]{stub}
+        (here) -- ++(0,0.5) node[mslstub, rotate=90, mstlinelen=0.5]{short};
+        \draw (there) to[short, o-]  ++(0, 0.5) node[msrstub]{};
+        \draw (here) -- ++(0, -0.5) node[msrstub, yscale=-1]{};
+\end{circuitikz}
+\end{LTXexample}
+
+
+\subsection{Electro-Mechanical Devices}
+
+The internal part of the motor and generator are, by default, filled white (to avoid compatibility problems with older versions of the package).
+
+\begin{groupdesc}
+    \circuitdesc*{elmech}{Motor}{M}( bottom/-90/0.2,
+    left/180/0.2, right/0/0.2, top/90/0.4 )
+	\circuitdesc*{elmech}{Generator}{G}
+\end{groupdesc}
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
 \draw (2,0) node[elmech](motor){M};
@@ -691,7 +1785,7 @@ These come from Stefan Erhardt's contribution of block diagram components. Add a
 \draw[thick,->>](motor.center)--++(1.5,0)node[midway,above]{$\omega$};
 \end{circuitikz}
 \end{LTXexample}
-The symbols can also be used along a path, using the transistor-path-syntax(T in front of the shape name, see section \ref{sec:transasbip}). Don´t forget to use parameter $n$ to name the node and get acces to the anchors:
+The symbols can also be used along a path, using the transistor-path-syntax(T in front of the shape name, see section \ref{sec:transasbip}). Don´t forget to use parameter $n$ to name the node and get access to the anchors:
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
 \draw (0,0) to [Telmech=M,n=motor] ++(0,-3) to [Telmech=M] ++(3,0) to [Telmech=G,n=generator] ++(0,3) to [R] (0,0);
@@ -704,55 +1798,563 @@ The symbols can also be used along a path, using the transistor-path-syntax(T in
 \subsection{Double bipoles}
 
 Transformers automatically use the inductor shape currently selected. These are the three possibilities:
-\begin{itemize}
-	\ctikzset{inductor=cute}
-	\circuititem{transformer}{Transformer (cute inductor)}{}
-	\ctikzset{inductor=american}
-	\circuititem{transformer}{Transformer (american inductor)}{}
-	\ctikzset{inductor=european}
-	\circuititem{transformer}{Transformer (european inductor)}{}
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{inductor=cute}
+    \circuitdesc{transformer}{Transformer (cute inductor)}{}( A1/180/0.1,
+    A2/180/0.1, B1/0/0.1, B2/0/0.1,
+    inner dot A1/-135/0.2, inner dot A2/135/0.2, inner dot B1/-45/0.1,
+    inner dot B2/45/0.1 )
+    \ctikzset{inductor=american}
+    \circuitdesc{transformer}{Transformer (american inductor)}{}( %
+    outer dot A1/180/0.2, outer dot A2/180/0.2,
+    outer dot B1/0/0.2, outer dot B2/0/0.2 )
+    \ctikzset{inductor=european}
+    \circuitdesc{transformer}{Transformer (european inductor)}{}
+    \circuitdesc{gyrator}{Gyrator}{}
+\end{groupdesc}
 
 
 Transformers with core are also available:
-\begin{itemize}
-	\ctikzset{inductor=cute}
-	\circuititem{transformer core}{Transformer  core (cute inductor)}{}
-	\ctikzset{inductor=american}
-	\circuititem{transformer core}{Transformer core (american inductor)}{}
-	\ctikzset{inductor=european}
-	\circuititem{transformer core}{Transformer core (european inductor)}{}
-	\ctikzset{inductor=cute} % reset default
-\end{itemize}
+\begin{groupdesc}
+    \ctikzset{inductor=cute}
+    \circuitdesc{transformer core}{Transformer  core (cute inductor)}{}
+    \ctikzset{inductor=american}
+    \circuitdesc{transformer core}{Transformer core (american inductor)}{}
+    \ctikzset{inductor=european}
+    \circuitdesc{transformer core}{Transformer core (european inductor)}{}
+    \ctikzset{inductor=cute} % reset default
+\end{groupdesc}
+
+
+
+\subsubsection{Double dipoles anchors}
+
+All the double bipoles/quadrupoles have the four anchors, two for each port.
+The first port, to the left, is port \texttt{A}, having the anchors \texttt{A1} (up) and \texttt{A2} (down); same for port \texttt{B}.
+
+They also expose the \texttt{base} anchor, for labelling, and anchors for setting dots or signs to specify polarity.
+The set of anchors, to which the standard ``geographical'' \texttt{north}, \texttt{north east}, etc. is here:
+
+\begin{quote}
+\begin{circuitikz}[cute inductors,
+    ]
+    \def\coordx(#1)[#2:#3]#4{node[circle, #4, draw, inner sep=1pt,pin={[#4, overlay, inner sep=0.5pt, font=\scriptsize, pin distance=#2cm, pin edge={#4, overlay,}]#3:#1}](#1){}}
+    \foreach \comp/\pos/\case in {%
+                            transformer/0/0%
+                            ,transformer core/4/1%
+                            ,gyrator/8/2%
+                            }{
+        \draw (\pos, 0) node[\comp](T){};
+        \ifcase\case
+            \foreach \a/\d/\t in {inner dot A1/0.2/75, inner dot A2/0.2/-75, inner dot B1/0.1/-45, inner dot B2/0.1/45}
+            \path (T.\a) \coordx(\a)[\d:\t]{red};
+        \or
+            \foreach \a/\d/\t in {outer dot A1/0.2/75, outer dot A2/0.2/-75, outer dot B1/0.2/-45, outer dot B2/0.2/45}
+            \path (T.\a) \coordx(\a)[\d:\t]{blue};
+        \or
+            \foreach \a/\t in {A1/120, A2/-120, B1/120, B2/-120, base/-90}
+            \path (T.\a) \coordx(\a)[0.2:\t]{green!50!black};
+        \fi
+    }
+\end{circuitikz}
+\end{quote}
 
-\begin{itemize}
-	\circuititem{gyrator}{Gyrator}{}
-	\circuititem{coupler}{Coupler}{}
-	\circuititem{coupler2}{Coupler, 2}{}
-\end{itemize}
+Also, the standard ``geographical'' \texttt{north}, \texttt{north east}, etc. are defined.
+A couple of examples follow:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[transformer] (T) {}
+  (T.A1) node[anchor=east] {A1}
+  (T.A2) node[anchor=east] {A2}
+  (T.B1) node[anchor=west] {B1}
+  (T.B2) node[anchor=west] {B2}
+  (T.base) node{K}
+  (T.inner dot A1) node[circ]{}
+  (T.inner dot B2) node[circ]{}
+;\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[gyrator] (G) {}
+  (G.A1) node[anchor=east] {A1}
+  (G.A2) node[anchor=east] {A2}
+  (G.B1) node[anchor=west] {B1}
+  (G.B2) node[anchor=west] {B2}
+  (G.base) node{K}
+;\end{circuitikz}
+\end{LTXexample}
+
+
+
+
+\subsection{Amplifiers}
+
+\begin{groupdesc}
+    \circuitdesc*{op amp}{Operational amplifier}{}( +/180/0.2, -/180/0.2, out/0/0.2, up/90/0.2, down/-90/0.2 )
+    \circuitdesc*{en amp}{Operational amplifier compliant to DIN/EN 60617 standard}{}
+    \circuitdesc*{fd op amp}{Fully differential operational amplifier\footnotemark}{}( out +/0/0.2, out -/0/0.2 )
+    \footnotetext{Contributed by Kristofer M. Monisit.}
+    \circuitdesc*{gm amp}{transconductance amplifier}{}
+    \circuitdesc*{inst amp}{plain instrumentation amplifier}{}( up/90/0.2, down/-90/0.2, refv up/45/0.2, refv down/-45/0.2 )
+    \circuitdesc*{fd inst amp}{Fully differential instrumentation amplifier}{}
+    \circuitdesc*{inst amp ra}{instrumentation amplifier with amplification resistance terminals}{}( ra+/180/0.1, ra-/180/0.1 )
+    \circuitdesc*{plain amp}{Plain amplifier}{}
+    \circuitdesc*{buffer}{Buffer}{}
+\end{groupdesc}
+
+\subsubsection{Amplifiers anchors}
+
+The op amp defines the inverting input (\texttt{-}), the non-inverting input (\texttt{+}) and the output (\texttt{out}) anchors:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[op amp] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out) node[right] {$v_o$}
+  (opamp.up) --++(0,0.5) node[vcc]{5\,\textnormal{V}}
+  (opamp.down) --++(0,-0.5) node[vee]{-5\,\textnormal{V}}
+;\end{circuitikz}
+\end{LTXexample}
+
+There are also two more anchors defined, \texttt{up} and \texttt{down}, for the power supplies:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[op amp] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out) node[right] {$v_o$}
+  (opamp.down) node[ground] {}
+  (opamp.up) ++ (0,.5) node[above] {\SI{12}{\volt}}
+     -- (opamp.up)
+;\end{circuitikz}
+\end{LTXexample}
+
+The fully differential op amp defines two outputs:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[fd op amp] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out +) node[right] {out +}
+  (opamp.out -) node[right] {out -}
+  (opamp.down) node[ground] {}
+;\end{circuitikz}
+\end{LTXexample}
+
+The instrumentation amplifier inst amp defines also references (normally you use the "down", unless you are flipping the component):
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[inst amp] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out) node[right] {out}
+  (opamp.up) node[vcc]{}
+  (opamp.down) node[vee] {}
+  (opamp.refv down) node[ground]{}
+  (opamp.refv up) to[short, -o] ++(0,0.3)
+;\end{circuitikz}
+\end{LTXexample}
+
+The fully diffential instrumentation amplifier inst amp defines two outputs:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[fd inst amp] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out +) node[right] {out +}
+  (opamp.out -) node[right] {out -}
+  (opamp.up) node[vcc]{}
+  (opamp.down) node[vee] {}
+  (opamp.refv down) node[ground]{}
+  (opamp.refv up) to[short, -o] ++(0,0.3)
+;\end{circuitikz}
+\end{LTXexample}
+
+The instrumentation amplifier with resistance terminals (\texttt{inst amp ra}) defines also terminals to add an amplification resistor:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[inst amp ra] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out) node[right] {out}
+  (opamp.up) node[vcc]{}
+  (opamp.down) node[vee] {}
+  (opamp.refv down) node[ground]{}
+  (opamp.refv up) to[short, -o] ++(0,0.3)
+  (opamp.ra-) to[R] (opamp.ra+)
+;\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Amplifiers customization}
+
+All these amplifier have the possibility to flip input and output (if needed) polarity. You can change polarity of the input with the
+\texttt{noinv input down} (default) or \texttt{noinv input up} key; and the output with \texttt{noinv output up} (default) or \texttt{noinv output down} key:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[fd inst amp,
+     noinv input up,
+     noinv output down] (opamp) {}
+  (opamp.+) node[left] {$v_+$}
+  (opamp.-) node[left] {$v_-$}
+  (opamp.out +) node[right] {out +}
+  (opamp.out -) node[right] {out -}
+  (opamp.up) node[vcc]{}
+  (opamp.down) node[vee] {}
+  (opamp.refv down) node[ground]{}
+  (opamp.refv up) to[short, -o] ++(0,0.3)
+;\end{circuitikz}
+\end{LTXexample}
+
+When you use the \texttt{noinv input/output ...} keys the anchors (\texttt{+}, \texttt{-}, \texttt{out +}, \texttt{out -}) will change with the effective position of the terminals. You have also the anchors \texttt{in up}, \texttt{in down}, \texttt{out up}, \texttt{out down} that will not change with the positive or negative sign.
+
+\paragraph{European-style amplifier customization}
+
+Thanks to the suggestions from David Rouvel (\email{david.rouvel@iphc.cnrs.fr}) there are several possible customization for the European-style amplifiers.
+
+Since 0.9.0, the default appearance of the symbol has changed to be more in line with the standard; notice that to have a bigger triangle by default we should require more packages, and I fear {Con\TeX t} compatibility; but see later on how to change it. Notice that the font used for the symbol is defined in \texttt{tripoles/en amp/font2} and that the font used for the \texttt{+} and \texttt{-} symbols is  \texttt{tripoles/en amp/font}.
+
+You can change the distances of the inputs, using \texttt{tripoles/en amp/input height} (default 0.3):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{tripoles/en amp/input height=0.45}
+    \draw (0,0)node[en amp](E){}
+        (E.out) node[right] {$v_{\mathrm{out}}$}
+        (E.-) node[left] {$v_{\mathrm{in}-}$}
+        (E.+) node[left] {$v_{\mathrm{in}+}$};
+\end{circuitikz}
+\end{LTXexample}
+
+and of course the key \texttt{noinv input up} is fully functional:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{tripoles/en amp/input height=0.45}
+    \draw (0,0)node[en amp, noinv input up](E){}
+        (E.out) node[right] {$v_{\mathrm{out}}$}
+        (E.-) node[left] {$v_{\mathrm{in}-}$}
+        (E.+) node[left] {$v_{\mathrm{in}+}$};
+\end{circuitikz}
+\end{LTXexample}
+
+To flip the amplifier in the horizontal direction, you can use \texttt{xscale=-1} as usual:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{tripoles/en amp/input height=0.45}
+    \draw (0,0)node[en amp, xscale=-1, noinv input up](E){}
+        (E.out) node[left] {$v_{\mathrm{out}}$}
+        (E.-) node[right] {$v_{\mathrm{in}-}$}
+        (E.+) node[right] {$v_{\mathrm{in}+}$};
+\end{circuitikz}
+\end{LTXexample}
+
+Notice that the label is fully mirrored, so check below for the generic way of changing this.
+
+You can use the new key \texttt{en amp text A} to change the infinity symbol with an A:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0)node[en amp, en amp text A](E){}
+        (E.out) node[right] {$v_{\mathrm{out}}$}
+        (E.-) node[left] {$v_{\mathrm{in}-}$}
+        (E.+) node[left] {$v_{\mathrm{in}+}$} ;
+\end{circuitikz}
+\end{LTXexample}
+
+And if you want, you can completely change the text using the key \texttt{en amp text={}}, which by default is \verb|$\mathstrut{\triangleright}\,{\infty}$|:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0)node[en amp, en amp text={%
+            ${\triangleright}$ \small 200}](E){}
+        (E.out) node[right] {$v_{\mathrm{out}}$}
+        (E.-) node[left] {$v_{\mathrm{in}-}$}
+        (E.+) node[left] {$v_{\mathrm{in}+}$} ;
+\end{circuitikz}
+\end{LTXexample}
+
+Notice two things here: the first, that \verb|\triangleright| is enclosed in braces to remove the default spacing it has as a binary operator, and that \texttt{en amp text A} is simply a shortcut for
+
+\begin{lstlisting}
+    en amp text={$\mathstrut{\triangleright}\,\mathrm{A}$}
+\end{lstlisting}
+
+
+To combine flipping with a generic label you just do:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0)node[en amp, xscale=-1, en amp text A](E){}
+        (E.out) node[left] {$v_{\mathrm{out}}$}
+        (E.-) node[right] {$v_{\mathrm{in}-}$}
+        (E.+) node[right] {$v_{\mathrm{in}+}$} ;
+\end{circuitikz}
+\end{LTXexample}
+
+But notice that the ``A'' is also flipped by the \texttt{xscale} parameter. So the solution in this case is to use \texttt{scalebox}, like this:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0)node[en amp, xscale=-1, en amp text={%
+    ${\triangleright}$ \scalebox{-1}[1]{\small 200}}](E){}
+        (E.out) node[left] {$v_{\mathrm{out}}$}
+        (E.-) node[right] {$v_{\mathrm{in}-}$}
+        (E.+) node[right] {$v_{\mathrm{in}+}$} ;
+\end{circuitikz}
+\end{LTXexample}
+
+
+\subsection{Support shapes and bipoles}\label{sec:support}
+
+Path style:
+\begin{groupdesc}
+\circuitdescbip{crossing}{Jumper style non-contact crossing}{xing}
+\end{groupdesc}
+
+\noindent Node style:
+
+\begin{groupdesc}
+    \circuitdesc{currarrow}{Arrows (current and voltage)}{}
+    \circuitdesc{inputarrow}{Arrow to draw at its tip, useful for block diagrams.}{}
+    \circuitdesc{circ}{Connected terminal}{}
+    \circuitdesc{ocirc}{Unconnected terminal}{}
+    \circuitdesc{diamondpole}{Diamond-style terminal}{}
+    \circuitdesc{jump crossing}{Jumper-style crossing node}{}
+    \circuitdesc{plain crossing}{Plain style crossing node}{}
+    \circuitdesc{waves}{Waves}{}( north/90/0.4, north east/45/0.4, east/-45/0.4, south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4,
+    left/135/0.2, top/45/0.2, right/45/0.2, bottom/-45/0.2 )
+    \circuitdesc*{bnc}{BNC connector}{}(left/135/0.6, right/45/0.6, center/-90/0.6, hot/0/0.6, zero/-135/0.6)
+\end{groupdesc}
+
+Moreover, you have the arrow tip \texttt{latexslim} which is an arrow similar to the old (in deprecated \texttt{arrows} library) \texttt{latex'} element:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+    \draw [latexslim-latexslim] (0,0) -- (1,0);
+\end{circuitikz}
+\end{LTXexample}
+
+
+
+\subsubsection{Terminal shapes}
+Since version 0.9.0, \texttt{circ}, \texttt{ocirc} , and \texttt{diamondpole} have all the standard geographical anchors, so you can do things like these:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american,]
+    \draw (0,-1) node[draw](R){R};
+    \draw (R.east) node[ocirc, right]{};
+\end{circuitikz}
+\end{LTXexample}
 
+The BNC connector is defined so that you can easily connect it as input or output (but remember that you need to flip the text if you flip the component):
+
+\begin{LTXexample}[varwidth, ]
+\begin{circuitikz}
+    \draw (0,0)
+    node[bnc](B1){$v_i$} to[R=\SI{50}{\ohm}] ++(3,0)
+    node[bnc, xscale=-1](B2){\scalebox{-1}[1]{$v_o$}};
+    \node [ground] at (B1.shield) {};
+    \node [eground] at (B2.shield){};
+\end{circuitikz}
+\end{LTXexample}
+
+It also has a \texttt{zero} anchor if you need to rotate it about its real center.
+
+\begin{LTXexample}[varwidth, ]
+\begin{circuitikz}
+    \draw[thin, red] (0,0) -- ++(1,0) (0,-1) -- ++(1,0);
+    \path (0,0) node[bnc]{} ++(1,0) node[bnc, rotate=-90]{};
+    \path (0,-1) node[bnc, anchor=zero]{} ++(1,0) node[bnc, anchor=zero, rotate=-90]{};
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Crossings}
+
+All circuit-drawing standards agree that to show a crossing without electric contact, a simple crossing of the wires suffices; the electrical contact must be explicitly marked with a filled dot.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+\draw(1,-1) to[short] (1,1)
+    (0,0) to[short] (2,0);
+\draw(4,-1) to[short] (4,1)
+    (3,0) to[short] (5,0)
+    (4,0) node[circ]{};
+\end{circuitikz}
+\end{LTXexample}
+
+However, sometime it is advisable to mark the non-contact situation more explicitly. To this end, you can use a path-style component called \texttt{crossing}:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+\draw(1,-1) to[short] (1,1) (0,0) to[crossing] (2,0);
+\draw(4,-1) to[short] (4,1) (3,0) to[short] (5,0)
+    (4,0) node[circ]{};
+\end{circuitikz}
+\end{LTXexample}
+
+That should suffice most of the time; the only problem is that the crossing jumper will be put in the center of the subpath where the \texttt{to[crossing]} is issued, so sometime a bit of trial and error is needed to position it.
+
+For a more powerful (and elegant) way you can use the crossing nodes:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+    \node at (1,1)[jump crossing](X){};
+    \draw (X.west) -- ++(-1,0);
+    \draw (X.east) to[R] ++(2,0);
+    \draw (X.north) node[vcc]{};
+    \draw (X.south) to[C] ++(0,-1.5);
+\end{circuitikz}
+\end{LTXexample}
+
+Notice that the \texttt{plain crossing} and the \texttt{jump crossing} have a small gap in the straight wire, to enhance the effect of crossing (as a kind of shadow).
+
+The size of the crossing elements can be changed with the key \texttt{bipoles/crossing/size} (default 0.2).
+
+
+\subsubsection{Arrows size}
+
+You can use the parameter  \texttt{current arrow scale} to change the size of the arrows in various components and indicators; the normal value is 16, higher numbers give smaller arrows and so on.  You need to use  \texttt{circuitikz/current arrow scale} if you use it into a node.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) to[R, i=f] ++(2,0) node[npn, anchor=B]{};
+    \draw (0,-2) to[R, f=f, current arrow scale=8] ++(2,0)
+            node[pnp, anchor=B, circuitikz/current arrow scale=8]{};
+    \draw (0,-4) to[R, f=f, current arrow scale=24] ++(2,0)
+            node[nigbt, anchor=B]{};
+\end{circuitikz}
+\end{LTXexample}
+
+\subsection{Switches and buttons}
+
+Switches and button come in to-style (the simple ones and the pushbuttons), and as nodes.
+
+\subsubsection{Traditional switches}
+These are all of the to-style type:
+
+\begin{groupdesc}
+    \circuitdescbip[cspst]{switch}{Switch}{spst}
+    \circuitdescbip[cspst]{closing switch}{Closing switch}{cspst}
+    \circuitdescbip[ospst]{opening switch}{Opening switch}{ospst}
+    \circuitdescbip[nos]{normal open switch}{Normally open switch}{nos}
+    \circuitdescbip[ncs]{normal closed switch}{Normally closed switch}{ncs}
+    \circuitdescbip[pushbutton]{push button}{Normally open push button}{normally open push button, nopb}
+    \circuitdescbip[ncpushbutton]{normally closed push button}{Normally closed push button}{ncpb}
+    \circuitdescbip[toggleswitch]{toggle switch}{Toggle switch}{}
+\end{groupdesc}
+
+while this is a node-style component:
+
+\begin{groupdesc}
+	\circuitdesc{spdt}{spdt}{}( in/180/0.2, out 1/0/0.2, out 2/0/0.2 )
+\end{groupdesc}
+
+\subsubsection{Cute switches}
+These switches have been introduced after version 0.9.0, and they come in also in to-style and in node-style, but they are size-matched so that they can be used together in a seamless way.
+
+The path element (to-style) are:
+\begin{groupdesc}
+    \circuitdescbip[cuteclosedswitch]{cute closed switch}{Cute closed switch}{ccsw}(mid/90/0.2, in/-135/0.2, out/-45/0.2)
+    \circuitdescbip[cuteopenswitch]{cute open switch}{Cute open switch}{cosw}
+    \circuitdescbip[cuteclosingswitch]{cute closing switch}{Cute closing switch}{ccgsw}
+    \circuitdescbip[cuteopeningswitch]{cute opening switch}{Cute opening switch}{cogsw}
+\end{groupdesc}
+while the node-style components are the single-pole, double-throw (\texttt{spdt}) ones:
+\begin{groupdesc}
+    \circuitdesc{cute spdt up}{Cute spdt up}{}( in/180/0.2, out 1/0/0.2, out 2/0/0.2 , mid/0/0.4)
+    \circuitdesc{cute spdt mid}{Cute spdt mid}{}
+    \circuitdesc{cute spdt down}{Cute spdt down}{}(mid/0/0.4)
+    \circuitdesc{cute spdt up arrow}{Cute spdt up with arrow}{}
+    \circuitdesc{cute spdt mid arrow}{Cute spdt mid with arrow}{}
+    \circuitdesc{cute spdt down arrow}{Cute spdt down with arrow}{}
+\end{groupdesc}
+
+\subsubsection{Switches anchors}
+
+The nodes-style switches have the following anchors:
+
+\bigskip
+\begin{circuitikz}
+    \def\coorda(#1)<#2>{node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\small, pin distance=0.1cm, pin edge={red, overlay,}]#2:#1}](#1){}}
+    \path (0,-1) -- (3,1); %bbox
+    \draw (0, 0) node[cute spdt up arrow](CS){};
+    \draw (2, 0) node[cute spdt up arrow](CS){};
+    \foreach \a/\b in {center/0, in/-135, out 1/45, out 2/-45, mid/135}
+    \path (CS.\a) \coorda(\a)<\b>;
+\end{circuitikz}
+
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[spdt] (Sw) {}
+  (Sw.in) node[left] {in}
+  (Sw.out 1) node[right] {out 1}
+  (Sw.out 2) node[right] {out 2}
+;\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0) to[C] (1,0) to[toggle switch , n=Sw] (2.5,0)
+   -- (2.5,-1) to[battery1] (1.5,-1) to[R] (0,-1) -| (0,0)
+  (Sw.out 2) -| (2.5, 1) to[R] (0,1) -- (0,0)
+;\end{circuitikz}
+\end{LTXexample}
+
+The \texttt{mid} anchor in the cute switches (both path- and node-style) can be used to combine switches to get more complex configurations:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,1.4) node[cute spdt up](S1){};
+    \draw (0,0)   node[cute spdt up](S2){};
+    \draw (0,-1)  node[cuteclosedswitchshape, yscale=-1](S3){};
+    \draw [densely dashed] (S1.mid)--(S2.mid)--(S3.mid);
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Cute switches customization}
+
+You can use the key \texttt{bipoles/cuteswitch/thickness} to decide the thickness of the switch lever. The units are the diameter of the \texttt{ocirc} connector, and the default is \texttt{1}.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{bipoles/cuteswitch/thickness=0.5}
+    \draw (0,1.4) node[cute spdt up](S1){};
+    \draw (0,0)   node[cute spdt up](S2){};
+    \draw (0,-1)  node[cuteclosedswitchshape, yscale=-1](S3){};
+    \draw [densely dashed] (S1.mid)--(S2.mid)--(S3.mid);
+\end{circuitikz}
+\end{LTXexample}
 
 \subsection{Logic gates}
+
+Logic gates, with two or more input, are supported. Albeit in principle these components are multipoles, the are considered tripoles here, for historical reasons (when they just had two inputs).
+
 \subsubsection{American Logic gates}
-\begin{itemize}
-	\circuititem{american and port}{American \textsc{and} port}{}
-	\circuititem{american or port}{American \textsc{or} port}{}
-	\circuititem{american not port}{American \textsc{not} port}{}
-	\circuititem{american nand port}{American \textsc{nand} port}{}
-	\circuititem{american nor port}{American \textsc{nor} port}{}
-	\circuititem{american xor port}{American \textsc{xor} port}{}
-	\circuititem{american xnor port}{American \textsc{xnor} port}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc*{american and port}{American \textsc{and} port}{}( in 1/180/0.2, in 2/180/0.2, out/0/0.2 )
+    \circuitdesc*{american or port}{American \textsc{or} port}{}( bin 1/135/0.2, bin 2/-135/0.2, bout/-45/0.2 )
+    \circuitdesc*{american not port}{American \textsc{not} port}{}
+    \circuitdesc*{american nand port}{American \textsc{nand} port}{}
+    \circuitdesc*{american nor port}{American \textsc{nor} port}{}
+    \circuitdesc*{american xor port}{American \textsc{xor} port}{}
+    \circuitdesc*{american xnor port}{American \textsc{xnor} port}{}
+\end{groupdesc}
 \subsubsection{European Logic gates}
-\begin{itemize}
-	\circuititem{european and port}{European \textsc{and} port}{}
-	\circuititem{european or port}{European \textsc{or} port}{}
-	\circuititem{european not port}{European \textsc{not} port}{}
-	\circuititem{european nand port}{European \textsc{nand} port}{}
-	\circuititem{european nor port}{European \textsc{nor} port}{}
-	\circuititem{european xor port}{European \textsc{xor} port}{}
-	\circuititem{european xnor port}{European \textsc{xnor} port}{}
-\end{itemize}
+\begin{groupdesc}
+    \circuitdesc*{european and port}{European \textsc{and} port}{}( in 1/180/0.2, in 2/180/0.2, out/0/0.2 )
+    \circuitdesc*{european or port}{European \textsc{or} port}{}
+    \circuitdesc*{european not port}{European \textsc{not} port}{}
+    \circuitdesc*{european nand port}{European \textsc{nand} port}{}
+    \circuitdesc*{european nor port}{European \textsc{nor} port}{}
+    \circuitdesc*{european xor port}{European \textsc{xor} port}{}
+    \circuitdesc*{european xnor port}{European \textsc{xnor} port}{}
+\end{groupdesc}
 
 \begin{framed}
 If (default behaviour) \texttt{americanports} option is active (or the style \texttt{[american ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the american version of the respective logic port.
@@ -760,65 +2362,330 @@ If (default behaviour) \texttt{americanports} option is active (or the style \te
 If otherwise \texttt{europeanports} option is active (or the style \texttt{[european ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the european version of the respective logic port.
 \end{framed}
 
-\begin{itemize}
-	\circuititem{schmitt}{Non-Inverting \textsc{Schmitttrigger}}{}
-	\circuititem{invschmitt}{Inverting \textsc{Schmitttrigger}}{}
-\end{itemize}
-\subsection{Amplifiers}
+\subsubsection{Special components}
 
-\begin{itemize}
-	\circuititem{op amp}{Operational amplifier}{}
-	\circuititem{en amp}{Operational amplifier compliant to DIN/EN 60617 standard}{}
-	\circuititem{fd op amp}{Fully differential operational amplifier\footnote{Contributed by Kristofer M. Monisit.}}{}
-	\circuititem{gm amp}{transconductance amplifier}{}
-	\circuititem{plain amp}{Plain amplifier}{}
-	\circuititem{buffer}{Buffer}{}
-\end{itemize}
+There is no ``european''  version of these symbols.
 
-\subsection{Support shapes}
+\begin{groupdesc}
+    \circuitdesc*{schmitt}{Non-Inverting \textsc{Schmitttrigger}}{}
+    \circuitdesc*{invschmitt}{Inverting \textsc{Schmitttrigger}}{}
+\end{groupdesc}
 
-\begin{itemize}
-	\circuititem{currarrow}{Arrows (current and voltage)}{}
-	\circuititem{inputarrow}{Arrow to draw at its tip, useful for block diagrams.}{}
-	\circuititem{circ}{Connected terminal}{}
-	\circuititem{ocirc}{Unconnected terminal}{}
-	\circuititem{diamondpole}{Diamond-style terminal}{}
-\end{itemize}
+\subsubsection{Logic port customization}
+
+As for most components, you can change the width and height of the ports; the thickness is given by the parameter \texttt{tripoles/thickness} (default 2):
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw (0,0) node[nand port] {}; \par
+\ctikzset{tripoles/american nand port/input height=.2}
+\ctikzset{tripoles/american nand port/port width=.4}
+\ctikzset{tripoles/thickness=4}
+\tikz \draw (0,0) node[nand port] {};
+\end{LTXexample}
+
+This is especially useful if you have ports with more than two inputs, which are instantiated
+with the parameter \texttt{number inputs} :
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+\draw (0,3) node[american and port] (A)  {P1};
+\begin{scope}
+    \ctikzset{tripoles/american or port/height=1.6}
+    \draw (A.out) -- ++(0.5,0)
+    node[american or port,
+    number inputs=5,
+    anchor=in 1] (B)  {P2};
+\end{scope}
+\draw (0,1.5) node[american or port] (C)  {P3};
+\draw (C.out) |- (B.in 2);
+\end{circuitikz}
+\end{LTXexample}
+
+You can tweak the appearance of american ``or'' family (\texttt{or}, \texttt{nor}, \texttt{xor}  and \texttt{xnor}) ports, too, with the parameters \texttt{inner} (how much the base circle go ``into'' the shape, default 0.3) and \texttt{angle} (the angle at which the base starts, default 70).
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw (0,0) node[xnor port] {};
+\ctikzset{tripoles/american xnor port/inner=.7}
+\ctikzset{tripoles/american xnor port/angle=40}
+\tikz \draw (0,0) node[xnor port] {};
+\end{LTXexample}
+
+\subsubsection{Logic port anchors}
+
+These are the anchors for logic ports:
+
+\bigskip
+\begin{circuitikz} [american]
+\def\coorda(#1)<#2>{node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\small, pin distance=0.1cm, pin edge={red, overlay,}]#2:#1}](#1){}}
+\path(-2,1) -- (11,-1);
+
+\draw (0,0) node[and port, number inputs=3](A){IC1} ;
+  \foreach \a/\d in {left/45, right/45, out/-45, in 1/135, in 2/135, in 3/135}
+    \path (A.\a) \coorda(\a)<\d>;
+
+\draw (4.5,0) node[and port, number inputs=3](A){IC1};
+  \foreach \a/\d in {north/90, north west/135, west/180, south west/-135,
+  south/-90, south east/45, east/45, north east/45}
+    \path (A.\a) \coorda(\a)<\d>;
+
+\draw (9,0) node[european and port, ](A){} ;
+  \foreach \a/\d in {left/45, right/45, center/-90}
+    \path (A.\a) \coorda(\a)<\d>;
+\end{circuitikz}
+\bigskip
+
+You have also ``border pin anchors'':
+
+\bigskip
+\begin{circuitikz} [american]
+\def\coorda(#1)<#2>{node[circle, red, draw, inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\small, pin distance=0.1cm, pin edge={red, overlay,}]#2:#1}](#1){}}
+\path(-2,1) -- (11,-1);
+
+\draw (0,0) node[american and port, number inputs=3](A){IC1} ;
+  \foreach \a/\d in {bin 1/-135, bin 2/-135, bin 3/-135, bout/-45}
+    \path (A.\a) \coorda(\a)<\d>;
+
+\draw (4.5,0) node[american or port, number inputs=3](A){IC1};
+  \foreach \a/\d in {bin 1/-135, bin 2/-135, bin 3/-135, bout/-45}
+    \path (A.\a) \coorda(\a)<\d>;
+
+\draw (9,0) node[european and port, ](A){} ;
+  \foreach \a/\d in {bin 1/-135, bin 2/-135, bout/-45}
+    \path (A.\a) \coorda(\a)<\d>;
+\end{circuitikz}
+\bigskip
+
+These anchors are especially useful if you want to negate inputs:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+\draw (0,3) node[american and port] (A)  {P1};
+\node at (A.bin 1) [ocirc, left]{} ;
+\begin{scope}
+    \ctikzset{tripoles/american or port/height=1.6}
+    \draw (A.out) -- ++(0.5,0) node[american or port,
+    number inputs=5, anchor=in 1] (B)  {P2};
+    \node at (B.bin 3) [ocirc, left]{} ;
+\end{scope}
+\draw (0,1.5) node[american or port] (C)  {P3};
+\node at (C.bin 2) [ocirc, left]{} ;
+\draw (C.out) |- (B.in 2);
+\end{circuitikz}
+\end{LTXexample}
+As you can see, the \texttt{center} anchor is (for historic reasons) not in the center at all. You can fix this with the command \verb|\ctikzset{logic ports origin=center}|:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+\ctikzset{logic ports origin=center}
+\draw (0,0) node[and port] (myand)  {}
+  (myand.in 1) node[anchor=east] {1}
+  (myand.in 2) node[anchor=east] {2}
+  (myand.out) node[anchor=west] {3};
+\draw[<-] (myand.center) -- ++(1,-1)
+   node{center};
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (0,2) node[and port] (myand1)  {}
+  (0,0) node[and port] (myand2)  {}
+  (2,1) node[xnor port] (myxnor)  {}
+  (myand1.out) -| (myxnor.in 1)
+  (myand2.out) -| (myxnor.in 2)
+;\end{circuitikz}
+\end{LTXexample}
+
+In the case of \textsc{not}, there are only \texttt{in} and \texttt{out} (although for compatibility reasons \texttt{in 1} is still defined and equal to \texttt{in}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+  (1,0) node[not port] (not1)  {}
+  (3,0) node[not port] (not2)  {}
+  (0,0) -- (not1.in)
+  (not2.in) -- (not1.out)
+  ++(0,-1) node[ground] {} to[C] (not1.out)
+  (not2.out) -| (4,1) -| (0,0)
+;\end{circuitikz}
+\end{LTXexample}
+
+
+
+\subsection{Chips}
+%%% This chapter is in the new format --- description and components.
+%%% The idea is to try to reorganize the manual before the next release.
+%%% See issue #24
+
+\texttt{CircuiTikZ} supports two types of variable-pin chips: DIP (Dual-in-Line Package) and QFP (Quad-Flat Package).
+\begin{groupdesc}
+    \circuitdesc*{dipchip}{Dual-in-Line Package chip}{}
+    \circuitdesc*{qfpchip}{Quad-Flat Package chip}{}
+\end{groupdesc}
+
+\subsubsection{DIP and QFP chips customization}
+
+You can customize the DIP chip with the keys \texttt{multipoles/dipchip/width} (default 1.2) and  \texttt{multipoles/dipchip/pin spacing} (default 0.4) that are expressed in fraction of basic lengths (see section~\ref{sec:components-size}).
+The height of the chip will be equal to half the numbers of pins multiplied by the spacing, plus one spacing for the borders.
+For the QFP chips, you can only chose the pin spacing with \texttt{multipoles/qfpchip/pin spacing} key.
+
+The pins of the chip can be ``hidden'' (that is, just a spot in the border, optionally marked with a number) or ``stick out'' with a thin lead by setting \texttt{multipoles/external pins width} greater than 0 (default value is 0.2, so you'll have leads as shown above).
+Moreover, you can transform the thin lead into a pad by setting the key \texttt{multipoles/external pad fraction} to something different form 0 (default is 0); the value expresses the fraction of the pin spacing space that the pad will use on both sides of the pin.
+
+The number of pins is settable with the key \texttt{num pins}.
+\textbf{Please notice} that the number of pins \textbf{must} be \emph{even} for \texttt{dipchip}s and \emph{multiple of 4} for \texttt{qfpchip}s, otherwise havoc will ensue.
+
+You can, if you want, avoid printing the numbers of the pin with \texttt{hide numbers} (default \texttt{show numbers}) if you prefer positioning them yourself (see the next section for the anchors you can use).
+The font used for the pins is adjustable with the key \texttt{multipoles/font} (default \verb|\tiny|)
+For special use you can suppress the orientation mark with the key \texttt{no topmark} (default \texttt{topmark}).
+
+The line thickness of the main shape is controlled by \texttt{multipoles/thickness} (default 2) and the one of the external pins/pads with \texttt{multipoles/external pins thickness} (default 1).
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}
+        \ctikzset{multipoles/thickness=4}
+        \ctikzset{multipoles/external pins thickness=2}
+        \draw (0,0) node[dipchip,
+          num pins=12,
+          hide numbers,
+          external pins width=0.3,
+          external pad fraction=4 ](C){IC1};
+        \draw (C.pin 1) -- ++(-0.5,0) to[R]
+          ++(0,-3) node[ground]{};
+          \node [right, font=\tiny]
+          at (C.bpin 1) {RST};
+    \end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}
+        \draw (0,0) node[dipchip,
+          num pins=8,
+          external pins width=0.0](C){IC1};
+        \draw (C.pin 1) -- ++(-0.5,0) to[R]
+          ++(0,-1.5) node[ground]{};
+    \end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}
+        \ctikzset{multipoles/font={\color{red}\tiny}}
+        \draw (0,0) node[qfpchip,
+          num pins=16,
+          external pad fraction=6](C){IC1};
+        \draw (C.pin 1) -- ++(-0.5,0) to[R]
+          ++(0,-2) node[ground]{};
+    \end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Chips anchors}
+
+Chips have anchors on pins and global anchors for the main shape.
+The pin anchors to be used to connect wires to the chip are called \texttt{pin 1}, \texttt{pin 2} , \dots, with just one space between \texttt{pin} and the number.
+Border pin anchors (\texttt{bpin 1}\dots) are always on the box border, and can be used to add numbers or whatever markings are needed.
+Obviously, in case of \texttt{multipoles/external pins width} equal to zero, border and normal pin anchors will coincide.
+
+Additionally, you have geometrical anchors on the chip ``box'', see the following figure. The nodes are available with the full name (like \texttt{north}) and with the short abbreviations \texttt{n}, \texttt{nw}, \texttt{w}\dots. The \texttt{dot} anchor is useful to add a personalized marker if you use the \texttt{no topmark} key.
+
+\begin{quote}
+    \bigskip
+    \def\coord(#1){node[circle, red, draw,  inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\scriptsize, pin distance=0.2cm, fill=white, fill opacity=0.5, text opacity=1, pin edge={red, overlay,}]75:#1}](#1){}}
+    \def\coordd(#1){node[circle, red, draw,  inner sep=1pt,pin={[red, overlay, inner sep=0.5pt, font=\scriptsize, pin distance=0.2cm, fill=white, fill opacity=0.5,  text opacity=1,pin edge={red, overlay,}]-45:#1}](#1){}}
+    \begin{circuitikz}[american, ]
+        \ctikzset{multipoles/dipchip/pin spacing=0.7}
+        \draw (0,0) node[dipchip,
+            external pins width=0.4,
+            external pad fraction=4](C){IC1};
+        \foreach \p in {1,...,8}
+            \path (C.pin \p) \coord(pin \p)
+            (C.bpin \p) \coordd(bpin \p);
+        % second chip
+        \draw (C.pin 7) to[R] ++(3,0)
+              node[dipchip,anchor=pin 2](D){IC2};
+        \foreach \p in {center, nw, ne, se, sw, north, south, west, east}
+            \path (D.\p) \coord(\p);
+        \path (D.text) \coordd(text);
+        % third chip
+        \draw (D.pin 7)  ++(2,0)
+              node[dipchip,anchor=pin 2, no topmark](E){};
+        \foreach \p in {center, n, w, e, s, dot}
+            \path (E.\p) \coord(\p);
+    \end{circuitikz}
+\end{quote}
+
+\subsubsection{Chips rotation}
+
+You can rotate chips, and normally the pin numbers are kept straight (option \texttt{straight numbers}, which is the default), but you can rotate them if you like with \texttt{rotated numbers}.
+Notice that the main label has to be (counter-) rotated manually in this case.
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \draw (0,0) node[dipchip,
+        rotate=90]{%
+        \rotatebox{-90}{IC2}};
+    \draw (3,0) node[qfpchip,
+        rotated numbers,
+        rotate=45]{IC3};
+\end{circuitikz}
+\end{LTXexample}
 
+\subsubsection{Chip special usage}
 
+You can use chips to have special, personalized blocks.
+Look at the following example, which is easily put into a macro.
 
-\section{Usage}
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+    \ctikzset{multipoles/thickness=3}
+    \ctikzset{multipoles/dipchip/width=2}
+    \draw (0,0) node[dipchip,
+        num pins=10, hide numbers, no topmark,
+        external pins width=0](C){Block};
+    \node [right, font=\tiny] at (C.bpin 1) {RST};
+    \node [right, font=\tiny] at (C.bpin 2) {IN1};
+    \node [right, font=\tiny] at (C.bpin 4) {/IN2};
+    \node [left, font=\tiny]  at (C.bpin 8) {OUT};
+    \draw (C.bpin 2) -- ++(-0.5,0) coordinate(extpin);
+    \node [ocirc, anchor=0](notin2) at (C.bpin 4) {};
+    \draw (notin2.180) -- (C.bpin 4 -| extpin);
+    \draw (C.bpin 8) to[short,-o] ++(0.5,0);
+    \draw (C.bpin 5) ++(0,0.1) -- ++(0.1,-0.1)
+        node[right, font=\tiny]{CLK} -- ++(-0.1,-0.1);
+    \draw (C.n) -- ++(0,1) node[vcc]{};
+    \draw (C.s) -- ++(0,-1) node[ground]{};
+\end{circuitikz}\end{LTXexample}
+
+\section{Labels and similar annotations}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, l=$R_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R=$R_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, v=$v_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R=$R_1$, i=$i_1$, v=$v_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
@@ -830,11 +2697,12 @@ If otherwise \texttt{europeanports} option is active (or the style \texttt{[euro
 Long names/styles for the bipoles can be used:
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}\draw
-  (0,0) to[resistor=1<\kilo\ohm>] (2,0) 
+  (0,0) to[resistor=1<\kilo\ohm>] (2,0)
 ;\end{circuitikz}
 \end{LTXexample}
 
 \subsection{Labels and Annotations}
+\label{sec:labels-and-annotations}
 Since Version 0.7, beside the original label (l) option, there is a new option to place a second label, called annotation (a) at each bipole. Up to now this is a beta-test and there can be problems. For example, up to now this option is not compatible with the concurrent use of voltage labels.
 
 The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
@@ -843,13 +2711,29 @@ The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
 \begin{circuitikz}
    \draw (0,0) to[R, l=$R_1$,a=1<\kilo\ohm>] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, l_=$R_1$,a^=1<\kilo\ohm>] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
+
+\textbf{Caveat:} notice that the way in which \texttt{circuitikz} processes the options, there will be problems if the label (or annotation, or voltage, or current) contains one of the characters $=$ (equal) or $,$ (comma), giving unexpected errors and wrong output.
+These two characters must be protected to the option parser using an \verb|\mbox| command, or redefining the characters with a \TeX\ \verb|\def|:
+
+\begin{LTXexample}[varwidth=true]
+    \def\eq{=}
+    \begin{circuitikz}
+        % the following will fail:
+        % \draw (0,0) to[R, l={$R=3}] (3,0);
+        \draw (0,0) to[R, l=\mbox{$R=3$}] (3,0);
+        \draw (0,0) to[R, l=$R\eq3$] (0,3);
+        \draw (3,3) to[R, l=\mbox{$R,3$}] (3,0);
+        % this works, but it has wrong spacing
+        \draw (0,3) to[R, l=$R{=}3$] (3,3);
+    \end{circuitikz}
+\end{LTXexample}
 
 \noindent The default orientation of labels is controlled by the options \texttt{smartlabels}, \texttt{rotatelabels} and \texttt{straightlabels} (or the corresponding \texttt{label/align} keys). Here are examples to see the differences:
 \begin{LTXexample}[varwidth=true]
@@ -860,7 +2744,7 @@ The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
   \draw (0,0) to[R=\i, *-o] (\i:2.5);
 }
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
 \ctikzset{label/align = rotate}
@@ -869,7 +2753,7 @@ The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
   \draw (0,0) to[R=\i, *-o] (\i:2.5);
 }
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
 \ctikzset{label/align = smart}
@@ -878,84 +2762,184 @@ The position of (a) and (l) labels can be adjusted with \_ and \^, respectively.
   \draw (0,0) to[R=\i, *-o] (\i:2.5);
 }
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
+
+You also can use stacked (two lines) labels.  The example should be self-explanatory: the two lines are specified as \texttt{l2=}\emph{line1}\texttt{ and }\emph{line2}. You can use the keys \texttt{l2 halign} to control horizontal position (\texttt{l}eft, \texttt{c}enter, \texttt{r}ight) and \texttt{l2 valign} to control the vertical one (\texttt{b}ottom, \texttt{c}center, \texttt{t}op).
+
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}[ american, ]
+        %
+        % default is l2 halign=l, l2 valign=c
+        %
+        \draw (0,0) to[R, l2_=$R_{CC}$ and \SI{4.7}{k\ohm},            , l2 valign=t] (2,0);
+        \draw (0,0) to[R, l2_=$R_{CC}$ and \SI{4.7}{k\ohm},            ,            ] (0,2);
+        \draw (0,0) to[R, l2_=$R_{CC}$ and \SI{4.7}{k\ohm}, l2 halign=c, l2 valign=b] (-2,0);
+        \draw (0,0) to[R, l2_=$R_{CC}$ and \SI{4.7}{k\ohm}, l2 halign=r, l2 valign=c] (0, -2);
+    \end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}[ american, ]
+        \draw (0,0) to[R, l2^=$R_{CC}$ and \SI{4.7}{k\ohm}, l2 halign=c, l2 valign=b] (2,0);
+        \draw (0,0) to[R, l2^=$R_{CC}$ and \SI{4.7}{k\ohm}, l2 halign=c,            ] (0,2);
+        \draw (0,0) to[R, l2^=$R_{CC}$ and \SI{4.7}{k\ohm},            , l2 valign=t] (-2,0);
+        \draw (0,0) to[R, l2^=$R_{CC}$ and \SI{4.7}{k\ohm}, l2 halign=c, l2 valign=t](0, -3);
+    \end{circuitikz}
+\end{LTXexample}
 
-\subsection{Currents}\label{currents}
-The counting direction of currents and voltages have changed with version 0.5, for compability reasons there is a option to use the olddirections(see options). For the new scheme, the following rules apply:
+\subsection{Currents and voltages}\label{curr-and-volt}
+
+The default direction/sign for currents and voltages in the components is, unfortunately, not standard, and can change across country and sometime across different authors.
+This unfortunate situation created a bit of confusion in \texttt{circuitikz} across the versions, with several incompatible changes starting from version 0.5.
+From version 0.9.0 onward, the maintainers agreed a new policy for the directions of bipoles' voltages and currents, depending on 4 different possible options:
 \begin{itemize}
-\item \textbf{Normal bipoles:} currents and voltages are counted positiv in drawing direction.
-\item \textbf{Current Sources:} current is counted positiv in drawing direction, voltage in opposite direction
-\item \textbf{Voltage Sources:} voltage is counted positiv in drawing direction, current in opposite direction
+    \item \texttt{oldvoltagedirection}, or the key style \texttt{voltage dir=old}: Use old way of voltage direction having a difference between european and american direction, with wrong default labelling for batteries (it was the default before version 0.5);
+    \item \texttt{nooldvoltagedirection}, or the key style \texttt{voltage dir=noold}: The standard from version 0.5 onward, utilize the (German?) standard of voltage arrows in the  direction of electric fields (without fixing batteries);
+    \item \texttt{RPvoltages} (meaning Rising Potential voltages), or the key style \texttt{voltage dir=RP}: the arrow is in direction of rising potential, like in \texttt{oldvoltagedirections}, but batteries and current sources are fixed so that they follow the passive/active standard: the default direction of \texttt{v} and \texttt{i} are chosen so that, when both values are positive:
+        \begin{itemize}
+            \item in passive component, the element is \emph{dissipating power};
+            \item in active components (generators), the element is \emph{generating power}.
+        \end{itemize}
+    \item \texttt{EFvoltages} (meaning Electric Field voltages), or the key style \texttt{voltage dir=EF}: the arrow is in direction of the electric field, like in \texttt{nooldvoltagedirections}, but batteries are fixed;
 \end{itemize}
-With this convention, the power at loads is positive and negative at sources.
+
+The standard direction of currents, flows and voltages are changed by these options; notice that the default drops in case of passive and active elements is normally different. Take care that in the case of \texttt{noold} and \texttt{EFvoltages} also the currents can switch directions. It is much easier to understand the several behaviors by looking at the following examples, that have been generated by the code:
+
+\begin{lstlisting}
+\foreach\element in {R, C, D, battery2, V, I, sV, cV, cI}{%
+    \noindent\ttfamily
+    \begin{tabular}{p{2cm}}
+        \element \\ american \\[15pt]
+        \element \\ european \\
+    \end{tabular}
+    \foreach\mode in {old, noold, RP, EF} {
+        \begin{tabular}{@{}l@{}}
+            \multicolumn{1}{c}{voltage dir} \\
+            \multicolumn{1}{c}{dir=\mode} \\[4pt]
+            \begin{tikzpicture}[
+                american, voltage dir=\mode,
+                ]
+                \draw (0,0) to[\element,  *-o, v=$v_1$, i=$i_1$, ] (2.5,0);
+            \end{tikzpicture}\\
+            \begin{tikzpicture}[
+                european, voltage dir=\mode,
+                ]
+                \draw (0,0) to[\element,  *-o, v=$v_1$, i=$i_1$, ] (2.5,0);
+            \end{tikzpicture}
+        \end{tabular}
+        \medskip
+    }
+    \par
+}
+\end{lstlisting}
+
+
+\foreach\element in {R, C, D, battery2, V, I,  sV, cV, cI}{%
+    \noindent\ttfamily
+    \begin{tabular}{p{2cm}}
+        \element \\ american \\[15pt]
+        \element \\ european \\
+    \end{tabular}
+    \foreach\mode in {old, noold, RP, EF} {
+        \begin{tabular}{@{}l@{}}
+            \multicolumn{1}{c}{voltage dir} \\
+            \multicolumn{1}{c}{dir=\mode} \\[4pt]
+            \begin{tikzpicture}[
+                american, voltage dir=\mode,
+                ]
+                \draw (0,0) to[\element,  *-o, v=$v_1$, i=$i_1$, ] (2.5,0);
+            \end{tikzpicture}\\
+            \begin{tikzpicture}[
+                european, voltage dir=\mode,
+                ]
+                \draw (0,0) to[\element,  *-o, v=$v_1$, i=$i_1$, ] (2.5,0);
+            \end{tikzpicture}
+        \end{tabular}
+        \medskip
+    }
+    \par
+}
+
+Obviously, you normally use just one between current and flows, but anyway you can
+change direction of the voltages,
+currents and flows using the complete keys \verb|i_>|, \verb|i^<|, \verb|i>_|, \verb|i>^|,
+as shown in the following examples.
+
+This manual has been typeset with the option \texttt{\chosenvoltoption}.
+
+\subsection{Currents}
+
+Inline (along the wire) currents are selected with \verb|i_>|, \verb|i^<|, \verb|i>_|, \verb|i>^|, and various simplification; the default position and direction is obtained with the key \verb|i=...|.
+
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i^>=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i_>=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i^<=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i_<=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i>^=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i>_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i<^=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i<_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
-Also
+Also:
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i<=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i>=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i^=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
@@ -967,26 +2951,26 @@ Also
 \begin{circuitikz}
    \draw (0,0) to[V=10V, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
-	
+\end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[V<=10V, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}		
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american]
    \draw (0,0) to[V=10V, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
-	
+\end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american]
    \draw (0,0) to[V=10V,invert, i_=$i_1$] (2,0);
 \end{circuitikz}
 \end{LTXexample}
-	
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american]
    \draw (0,0) to[dcisource=1A, i_=$i_1$] (2,0);
@@ -997,12 +2981,12 @@ Also
 \begin{circuitikz}[american]
    \draw (0,0) to[dcisource=1A,invert, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}			
+\end{LTXexample}
 
 \subsection{Flows}\label{flows}
 As an alternative for the current arrows, you can also use the following flows. They can also be used to indicate thermal or power flows. The syntax is pretty the same as for currents.
 
-\textit{This is a new beta feature since version 0.8.3, therefore, please provide bugreports or hints to optimize this feature regarding placement and appearance! This means, that the appearance may change in the future!}
+\textit{This is a new beta feature since version 0.8.3; therefore, please provide bug reports or hints to optimize this feature regarding placement and appearance! This means that the appearance may change in the future!}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
@@ -1047,7 +3031,7 @@ As an alternative for the current arrows, you can also use the following flows.
 \end{LTXexample}
 
 \subsection{Voltages}
-See introduction note at Currents (chapter \ref{currents}, page \pageref{currents})!
+See introduction note at Currents (chapter \ref{curr-and-volt}, page \pageref{curr-and-volt})!
 
 \subsubsection{European style} The default, with arrows. Use option \texttt{europeanvoltage} or style \verb![european voltages]!.
 
@@ -1079,20 +3063,20 @@ See introduction note at Currents (chapter \ref{currents}, page \pageref{current
 \begin{circuitikz}
    \draw (0,0) to[V=10V, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
-	
+\end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[V<=10V, i_=$i_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}		
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[I=1A, v_=$u_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
-	
+\end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[I<=1A, v_=$u_1$] (2,0);
@@ -1104,13 +3088,24 @@ See introduction note at Currents (chapter \ref{currents}, page \pageref{current
    \draw (0,0) to[I=$~$,l=1A, v_=$u_1$] (2,0);
 \end{circuitikz}
 \end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[I,l=1A, v_=$u_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+   \draw (0,0) to[battery,l_=1V, v=$u_1$, i=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
 
-\subsubsection{American style} For those who like it (not me). Use option \texttt{americanvoltage} or set \verb![american voltages]!.
+
+
+\subsubsection{American style}
+Use option \texttt{americanvoltage} or set \verb![american voltages]!.
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american voltages]
@@ -1140,14 +3135,111 @@ See introduction note at Currents (chapter \ref{currents}, page \pageref{current
 \begin{circuitikz}[american]
    \draw (0,0) to[I=1A, v_=$u_1$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
-	
+\end{LTXexample}
+
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american]
    \draw (0,0) to[I<=1A, v_=$i_1$] (2,0);
 \end{circuitikz}
 \end{LTXexample}
 
+\subsubsection{Voltage position} It is possible to move away the arrows and the plus or minus signs with the key \texttt{voltages shift} (default value is \texttt{0}, which gives the standard position):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[]
+   \draw (0,0) to[R, v=$v_1$, i=$i_1$] (2,0);
+   \draw (0,-1) to[R, v=$v_1$, i=$i_1$,
+      voltage shift=0.5] (2,-1);
+   \draw (0,-2) to[R, v=$v_1$, i=$i_1$,
+      voltage shift=1.0, ] (2,-2);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american voltages, voltage shift=0.5]
+   \draw (0,0) to[R, v=$v_1$, i=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Notes that \texttt{american voltage} also affects batteries.
+
+\begin{LTXexample}[varwidth=true]
+    \begin{circuitikz}[voltage shift=0.5]
+   \draw (0,0) to[battery,l_=1V, v=$u_1$, i=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american voltages, voltage shift=0.5]
+   \draw (0,0) to[battery,l_=1V, v=$u_1$, i=$i_1$] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{American voltages customization}
+
+Since 0.9.0, you can change the font\footnote{There where a bug before, noticed by the user \texttt{dzereb} on \href{https://tex.stackexchange.com/questions/487683/odd-minus-style-when-drawing-american-voltage}{tex.stackexchange.com} which made the symbols using different fonts in a basically random way. In the same page, user \texttt{campa} found the problem. Thanks!} used by the \texttt{american voltages} style, by setting to something different from nothing the key \texttt{voltage/american font} (default: nothing, using the current font) style:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \begin{scope}
+        \ctikzset{voltage/american font=\tiny\boldmath}
+        \draw (0,0) to[R,v=$V_S$] ++(2,0);
+    \end{scope}
+    \draw (0,-2) to[R,v=$V_S$] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+Also, if you want to change the symbols (sometime just the $+$ sign is drawn, for example, or for highlighting something),
+using the keys \texttt{voltage/american plus} and \texttt{voltage/american minus} (default \verb|$+$| and \verb|$-$|).
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}[american]
+    \ctikzset{voltage/american font=\scriptsize\boldmath}
+    \ctikzset{voltage/american plus=\textcolor{red}{$\oplus$}}
+    \ctikzset{voltage/american minus=\textcolor{blue}{$\ominus$}}
+    \draw (0,0) to[R,v_>=$V_S$] ++(2,0);
+    \draw (0,-2) to[R,v_<=$V_S$] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+This could be especially useful if you define a style, to use like this:
+
+\begin{LTXexample}[varwidth=true]
+\tikzset{red plus/.style={
+    circuitikz/voltage/american plus=\textcolor{red}{$+$},
+}}
+\begin{circuitikz}[american]
+    \draw (0,0) to[R,v_>=$V_S$, red plus] ++(2,0);
+    \draw (0,-2) to[R,v_<=$V_S$] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
+\subsubsection{Global properties of voltages and currents}
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw (0,0) to[R, v=1<\volt>] (2,0); \par
+\ctikzset{voltage/distance from node=.1}
+\tikz \draw (0,0) to[R, v=1<\volt>] (2,0);
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw (0,0) to[C, i=$\imath$] (2,0); \par
+\ctikzset{current/distance = .2}
+\tikz \draw (0,0) to[C, i=$\imath$] (2,0);
+\end{LTXexample}
+
+\noindent However, you can override the properties \verb!voltage/distance from node!\footnote{That is, how distant from the initial and final points of the path the arrow starts and ends.}, \verb!voltage/bump b!\footnote{Controlling how high the bump of the arrow is --- how curved it is.} and \verb!voltage/european label distance!\footnote{Controlling how distant from the bipole the voltage label will be.} on a per-component basis, in order to fine-tune the voltages:
+
+\begin{LTXexample}[varwidth=true]
+\tikz \draw (0,0) to[R, v=1<\volt>] (1.5,0)
+       to[C, v=2<\volt>] (3,0); \par
+\ctikzset{bipoles/capacitor/voltage/%
+     distance from node/.initial=.7}
+\tikz \draw (0,0) to[R, v=1<\volt>] (1.5,0)
+       to[C, v=2<\volt>] (3,0); \par
+\end{LTXexample}
+
+
+
 
 \subsection{Nodes}
 
@@ -1278,7 +3370,7 @@ For some components label, current and voltage behave as one would expect:
 \end{circuitikz}
 \end{LTXexample}
 
-The following results from using the option \texttt{americancurrent} or using the style \verb![american currents]!.
+The following results from using the option \texttt{americancurrent} or using the style \texttt{[american currents]}.
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american currents]
@@ -1346,7 +3438,7 @@ The same holds for voltage sources:
 \end{circuitikz}
 \end{LTXexample}
 
-The following results from using the option \texttt{americanvoltage} or the style \verb![american voltages]!.
+The following results from using the option \texttt{americanvoltage} or the style \texttt{[american voltages]}.
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}[american voltages]
@@ -1388,37 +3480,37 @@ If the option {\ttfamily siunitx} is active (and \emph{not} in \ConTeXt), then t
 \begin{circuitikz}
    \draw (0,0) to[R, l=1<\kilo\ohm>] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, l=$\SI{1}{\kilo\ohm}$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i=1<\milli\ampere>] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, i=$\SI{1}{\milli\ampere}$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, v=1<\volt>] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[R, v=$\SI{1}{\volt}$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 
 
@@ -1429,7 +3521,7 @@ Bipole paths can also mirrored and inverted (or reverted) to change the drawing
 \begin{circuitikz}
    \draw (0,0) to[pD] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
@@ -1440,20 +3532,20 @@ Bipole paths can also mirrored and inverted (or reverted) to change the drawing
 \begin{circuitikz}
    \draw (0,0) to[pD, invert] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
-Placing labels, currents and voltages works also, please note, that mirroring and inverting does not incfluence the positioning of labels and voltages. Labels are by default above/right of the bipole and voltages below/left, respectively.
+Placing labels, currents and voltages works also, please note, that mirroring and inverting does not influence the positioning of labels and voltages. Labels are by default above/right of the bipole and voltages below/left, respectively.
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[ospst=T, i=$i_1$, v=$v$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
    \draw (0,0) to[ospst=T, mirror, i=$i_1$, v=$v$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
@@ -1464,7 +3556,7 @@ Placing labels, currents and voltages works also, please note, that mirroring an
 \begin{circuitikz}
    \draw (0,0) to[ospst=T,mirror,invert, i=$i_1$, v=$v$] (2,0);
 \end{circuitikz}
-\end{LTXexample}	
+\end{LTXexample}
 
 
 \subsection{Putting them together}
@@ -1483,7 +3575,9 @@ Placing labels, currents and voltages works also, please note, that mirroring an
 \end{LTXexample}
 
 \subsection{Line joins between Path Components}
-Line joins should be calculated correctly, if the were on the same path and if the path is not closed. For example, the following path is not closed correctly(\textit{--cycle} does not work here!):
+\label{sec:line-joins}
+
+Line joins should be calculated correctly, if the are on the same path and if the path is not closed. For example, the following path is not closed correctly (\textit{--cycle} does not work here!):
 \begin{LTXexample}[varwidth=true]
 	\begin{tikzpicture}[line width=3pt,european]
 	\draw (0,0) to[R]++(2,0)to[R]++(0,2)
@@ -1491,7 +3585,7 @@ Line joins should be calculated correctly, if the were on the same path and if t
 	\draw[red,line width=1pt] circle(2mm);
 	\end{tikzpicture}
 \end{LTXexample}
-To correct the line ending, there are support shapes to fill the missing rectangle. They can be used like the support shapes(*,o,d) using a dot (.) on one or both ends of a component(have a look at the last resistor in this example:
+To correct the line ending, there are support shapes to fill the missing rectangle. They can be used like the support shapes (*,o,d) using a dot (.) on one or both ends of a component (have a look at the last resistor in this example:
 \begin{LTXexample}[varwidth=true]
 	\begin{tikzpicture}[line width=3pt,european]
 	\draw (0,0) to[R]++(2,0)to[R]++(0,2)
@@ -1501,33 +3595,15 @@ To correct the line ending, there are support shapes to fill the missing rectang
 \end{LTXexample}
 
 
-\section{Not only bipoles}
-Since only bipoles (but see section~\ref{sec:transasbip}) can be placed "along a line", components with more than two terminals are placed as nodes:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}
-\draw (0,0) node[npn](npn)  at (0,0) {};
-\draw (npn.C) --++(0,0.5) node[vcc]{+5\,\textnormal{V}};
-\draw (npn.E) --++(0,-0.5) node[vee]{-5\,\textnormal{V}};
-\end{circuitikz}
-\end{LTXexample}
-
-\subsection{Anchors}
-
-In order to allow connections with other components, all components define anchors. 
+\section{Colors}
 
-\subsubsection{Logical ports} All logical ports, except \textsc{not}, have two inputs and one output. They are called respectively \texttt{in 1}, \texttt{in 2}, \texttt{out}:
+\subsection{Shape colors}
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[and port] (myand)  {}
-  (myand.in 1) node[anchor=east] {1}
-  (myand.in 2) node[anchor=east] {2}
-  (myand.out) node[anchor=west] {3}
-;\end{circuitikz}
-\end{LTXexample}
+The color of the components is stored in the key \verb!\circuitikzbasekey/color!. Circui\TikZ\ tries to follow the color set in \TikZ, although sometimes it fails. If you change color in the picture, please do not use just the color name as a style, like \verb![red]!, but rather assign the style \verb![color=red]!.
 
+Compare for instance
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
+\begin{circuitikz} \draw[red]
   (0,2) node[and port] (myand1)  {}
   (0,0) node[and port] (myand2)  {}
   (2,1) node[xnor port] (myxnor)  {}
@@ -1536,545 +3612,366 @@ In order to allow connections with other components, all components define ancho
 ;\end{circuitikz}
 \end{LTXexample}
 
-In the case of \textsc{not}, there are only \texttt{in} and \texttt{out} (although for compatibility reasons \texttt{in 1} is still defined and equal to \texttt{in}):
+and
 
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (1,0) node[not port] (not1)  {}
-  (3,0) node[not port] (not2)  {}
-  (0,0) -- (not1.in) 
-  (not2.in) -- (not1.out) 
-  ++(0,-1) node[ground] {} to[C] (not1.out) 
-  (not2.out) -| (4,1) -| (0,0)
+\begin{circuitikz} \draw[color=red]
+  (0,2) node[and port] (myand1)  {}
+  (0,0) node[and port] (myand2)  {}
+  (2,1) node[xnor port] (myxnor)  {}
+  (myand1.out) -| (myxnor.in 1)
+  (myand2.out) -| (myxnor.in 2)
 ;\end{circuitikz}
 \end{LTXexample}
 
-\subsubsection{Transistors} For \textsc{nmos}, \textsc{pmos}, \textsc{nfet}, \textsc{nigfete}, \textsc{nigfetd}, \textsc{pfet}, \textsc{pigfete}, and \textsc{pigfetd}  transistors  one has \texttt{base}, \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with \texttt{B}, \texttt{G}, \texttt{S} and \texttt{D}):
-
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[nmos] (mos)  {}
-  (mos.gate) node[anchor=east] {G}
-  (mos.drain) node[anchor=south] {D}
-  (mos.source) node[anchor=north] {S}
+One can of course change the color \emph{in medias res}:
+\begin{LTXexample}[pos=t, varwidth=true]
+\begin{circuitikz} \draw
+  (0,0) node[pnp, color=blue] (pnp2) {}
+  (pnp2.B) node[pnp, xscale=-1, anchor=B, color=brown] (pnp1) {}
+  (pnp1.C) node[npn, anchor=C, color=green] (npn1) {}
+  (pnp2.C) node[npn, xscale=-1, anchor=C, color=magenta] (npn2) {}
+  (pnp1.E) -- (pnp2.E)  (npn1.E) -- (npn2.E)
+  (pnp1.B) node[circ] {} |- (pnp2.C) node[circ] {}
 ;\end{circuitikz}
 \end{LTXexample}
 
+The all-in-one stream of bipoles poses some challanges, as only the actual body of the bipole, and not the connecting lines, will be rendered in the specified color. Also, please notice the curly braces around the \texttt{to}:
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pigfete] (pigfete)  {}
-  (pigfete.G) node[anchor=east] {G}
-  (pigfete.D) node[anchor=north] {D}
-  (pigfete.S) node[anchor=south] {S}
-  (pigfete.bulk) node[anchor=west] {Bulk}
+\begin{circuitikz} \draw
+  (0,0) to[V=1<\volt>] (0,2)
+      { to[R=1<\ohm>, color=red] (2,2) }
+        to[C=1<\farad>] (2,0) -- (0,0)
 ;\end{circuitikz}
 \end{LTXexample}
 
-Similarly \textsc{njfet} and \textsc{pjfet} have  \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with  \texttt{G}, \texttt{S} and \texttt{D}):
-
+Which, for some bipoles, can be frustrating:
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pjfet] (pjfet)  {}
-  (pjfet.G) node[anchor=east] {G}
-  (pjfet.D) node[anchor=north] {D}
-  (pjfet.S) node[anchor=south] {S}
+\begin{circuitikz} \draw
+  (0,0){to[V=1<\volt>, color=red] (0,2) }
+        to[R=1<\ohm>] (2,2)
+        to[C=1<\farad>] (2,0) -- (0,0)
 ;\end{circuitikz}
 \end{LTXexample}
 
-For \textsc{npn}, \textsc{pnp}, \textsc{nigbt}, and \textsc{pigbt} transistors the anchors are  \texttt{base}, \texttt{emitter} and \texttt{collector} anchors (which can be abbreviated with \texttt{B}, \texttt{E} and \texttt{C}):
-
+The only way out is to specify different paths:
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[npn] (npn)  {}
-  (npn.base) node[anchor=east] {B}
-  (npn.collector) node[anchor=south] {C}
-  (npn.emitter) node[anchor=north] {E}
+\begin{circuitikz} \draw[color=red]
+  (0,0) to[V=1<\volt>, color=red] (0,2);
+  \draw (0,2) to[R=1<\ohm>] (2,2)
+        to[C=1<\farad>] (2,0) -- (0,0)
 ;\end{circuitikz}
 \end{LTXexample}
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pigbt] (pigbt)  {}
-  (pigbt.B) node[anchor=east] {B}
-  (pigbt.C) node[anchor=north] {C}
-  (pigbt.E) node[anchor=south] {E}
-;\end{circuitikz}
-\end{LTXexample}
+And yes: this is a bug and \emph{not} a feature\ldots
 
-Here is one composite example (please notice that the \texttt{xscale=-1} style would also reflect the label of the transistors, so here a new node is added and its text is used, instead of that of \texttt{pnp1}):
+\subsection{Fill colors}
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pnp] (pnp2) {2}
-  (pnp2.B) node[pnp, xscale=-1, anchor=B] (pnp1) {}
-    (pnp1) node {1}
-  (pnp1.C) node[npn, anchor=C] (npn1) {}
-  (pnp2.C) node[npn, xscale=-1, anchor=C] (npn2) {}
-  (pnp1.E) -- (pnp2.E)  (npn1.E) -- (npn2.E)
-  (pnp1.B) node[circ] {} |- (pnp2.C) node[circ] {}
-;\end{circuitikz}
-\end{LTXexample}
+Since version 0.9.0, you can also fill most shapes with a color (the manual specifies which ones are fillable or not). The syntax is quite intuitive:
 
-Similarly, transistors and other components can be reflected vertically:
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pigfete, yscale=-1] (pigfete)  {}
-  (pigfete.bulk) node[anchor=west] {Bulk}
-  (pigfete.G) node[anchor=east] {G}
-  (pigfete.D) node[anchor=south] {D}
-  (pigfete.S) node[anchor=north] {S}
+\begin{circuitikz} \draw
+    (0,2) node[and port, fill=yellow] (myand1)  {}
+    (0,0) node[and port, fill=cyan] (myand2)  {}
+    (2,1) node[xnor port,fill=red!30!white] (myxnor)  {}
+  (myand1.out) -| (myxnor.in 1)
+  (myand2.out) -| (myxnor.in 2)
 ;\end{circuitikz}
 \end{LTXexample}
 
-\begin{LTXexample}[varwidth=true]
-   \begin{circuitikz}
-        \draw (0,2) 
-            node[rground, yscale=-1] {} 
-        to[R=$R_1$] (0,0) 
-            node[sground] {};
-    \end{circuitikz} 
-\end{LTXexample}
+You can combine shape colors with fill colors, too, but you should use the \texttt{draw} color option style for this:
 
-\subsubsection{Other tripoles} When inserting a thrystor, a triac or a potentiometer, one needs to refer to the third node--gate (\texttt{gate} or \texttt{G}) for the former two; wiper (\texttt{wiper} or \texttt{W}) for the latter one. This is done by giving a name to the bipole:
-\label{bipole-naming}
 \begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) to[Tr, n=TRI] (2,0) 
-        to[pR, n=POT] (4,0);
-  \draw[dashed] (TRI.G) -| (POT.wiper) 
+\begin{circuitikz} \draw[color=red]
+    (0,2) node[and port, fill=yellow] (myand1)  {1}
+    (0,0) node[and port, fill=cyan] (myand2)  {2}
+    (2,1) node[xnor port,fill=red!30!white] (myxnor)  {3}
+  (myand1.out) -| (myxnor.in 1)
+  (myand2.out) -| (myxnor.in 2)
 ;\end{circuitikz}
 \end{LTXexample}
 
-As for the switches:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[spdt] (Sw) {}
-  (Sw.in) node[left] {in}
-  (Sw.out 1) node[right] {out 1}
-  (Sw.out 2) node[right] {out 2}
-;\end{circuitikz}
-\end{LTXexample}
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
- (0,0) to[C] (1,0) to[toggle switch , n=Sw] (2.5,0) 
-   -- (2.5,-1) to[battery1] (1.5,-1) to[R] (0,-1) -| (0,0)
-  (Sw.out 2) -| (2.5, 1) to[R] (0,1) -- (0,0)
-;\end{circuitikz}
-\end{LTXexample}
+This is because, as you can see from the following example in port \texttt{2}, you can't specify both a fill and a color in the node (yes, it's a bug too, but it's quite complex to solve given the current circuit\TikZ{} architecture).  a workaround is shown in port \texttt{3}:
 
-The ports of the mixer and adder can be addressed with numbers or \texttt{west}/\texttt{south}/\texttt{east}/\texttt{north}:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[mixer] (mix) {}
-  (mix.1) node[left] {1}
-  (mix.2) node[below] {2}
-  (mix.3) node[right] {3}
-  (mix.4) node[above] {4}
-;\end{circuitikz}
-\end{LTXexample}
 
-The Wilkinson divider has:
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz} \draw
-  (0,0) node[wilkinson] (w) {\SI{3}{dB}}
-  (w.in) to[short,-o] ++(-0.5,0)
-  (w.out1) to[short,-o] ++(0.5,0)
-  (w.out2) to[short,-o] ++(0.5,0)
-  (w.in) node[below left] {\texttt{in}}
-  (w.out1) node[below right] {\texttt{out1}}
-  (w.out2) node[above right] {\texttt{out2}}
-  ;
-\end{circuitikz}
+  (0,2) node[and port, color=black] (myand1)  {1}
+  (0,0) node[and port, color=blue, fill=cyan] (myand2)  {2}
+  (2,1) {[color=blue] node[xnor port, fill=cyan] (myxnor)  {3}}
+  (myand1.out) -| (myxnor.in 1)
+  (myand2.out) -| (myxnor.in 2)
+;\end{circuitikz}
 \end{LTXexample}
 
-\subsubsection{Operational amplifier} The op amp defines the inverting input (\texttt{-}), the non-inverting input (\texttt{+}) and the output (\texttt{out}) anchors:
+Notice also that the connection point are always filled, although the color \emph{tries} to follow the color of the filling of the component:
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[op amp] (opamp) {}
-  (opamp.+) node[left] {$v_+$}
-  (opamp.-) node[left] {$v_-$}
-  (opamp.out) node[right] {$v_o$}
-  (opamp.up) --++(0,0.5) node[vcc]{5\,\textnormal{V}}
-  (opamp.down) --++(0,-0.5) node[vee]{-5\,\textnormal{V}}
-;\end{circuitikz}
+\begin{LTXexample}[varwidth=true, pos=t]
+\begin{circuitikz}
+    \fill[cyan] (0,3.0) rectangle (7,7);
+    \draw [fill=yellow, ] (4,4) to [D,o-o] ++(0,2) to[D*, fill=yellow] ++(2,0)
+    to[D*] ++(0,-2)  to[D, fill=red, o-o] ++(-2,0);
+    \draw (1,4) node[ocirc]{} -- ++(1,0) node[ocirc]{};
+    \draw (1,4.5) to[short, o-o] ++(1,0) to[short, -o] ++(1,0);
+    \draw[fill=yellow] (1,5) to[short, o-o] ++(1,0) to[short, -o] ++(1,0);
+    \draw (1,5.5) to[short, fill=red, o-o] ++(1,0) to[short, -o] ++(1,0);
+\end{circuitikz}
 \end{LTXexample}
 
-There are also two more anchors defined, \texttt{up} and \texttt{down}, for the power supplies:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[op amp] (opamp) {}
-  (opamp.+) node[left] {$v_+$}
-  (opamp.-) node[left] {$v_-$}
-  (opamp.out) node[right] {$v_o$}
-  (opamp.down) node[ground] {}
-  (opamp.up) ++ (0,.5) node[above] {\SI{12}{\volt}} 
-     -- (opamp.up)
-;\end{circuitikz}
-\end{LTXexample}
+\section{FAQ}
 
-The fully differential op amp defines two outputs:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[fd op amp] (opamp) {}
-  (opamp.+) node[left] {$v_+$}
-  (opamp.-) node[left] {$v_-$}
-  (opamp.out +) node[right] {out +}
-  (opamp.out -) node[right] {out -}
-  (opamp.down) node[ground] {}
-;\end{circuitikz}
-\end{LTXexample}
+\noindent Q: When using \verb!\tikzexternalize! I get the following error:
+\begin{verbatim}
+ ! Emergency stop.
+\end{verbatim}
 
-\subsubsection{Double bipoles} All the (few, actually) double bipoles/quadrupoles have
-the four anchors, two for each port. The first port, to the left, is port \texttt{A}, having the anchors \texttt{A1} (up) and \texttt{A2} (down); same for port \texttt{B}. They also expose the \texttt{base} anchor, for labelling:
+\noindent A: The \TikZ\ manual states:
+\begin{quotation}
+Furthermore, the library assumes that all \LaTeX\ pictures are ended
+    with \\\verb!\end{tikzpicture}!.
+\end{quotation}
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[transformer] (T) {}
-  (T.A1) node[anchor=east] {A1}
-  (T.A2) node[anchor=east] {A2}
-  (T.B1) node[anchor=west] {B1}
-  (T.B2) node[anchor=west] {B2}
-  (T.base) node{K}
-;\end{circuitikz}
-\end{LTXexample}
+Just substitute every occurrence of the environment \verb!circuitikz! with \verb!tikzpicture!. They are actually pretty much the same.
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[gyrator] (G) {}
-  (G.A1) node[anchor=east] {A1}
-  (G.A2) node[anchor=east] {A2}
-  (G.B1) node[anchor=west] {B1}
-  (G.B2) node[anchor=west] {B2}
-  (G.base) node{K}
-;\end{circuitikz}
-\end{LTXexample}
+\bigskip
 
-However:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  (0,0) node[coupler] (c) {\SI{10}{dB}}
-  (c.1) to[short,-o] ++(-0.5,0)
-  (c.2) to[short,-o] ++(0.5,0)
-  (c.3) to[short,-o] ++(0.5,0)
-  (c.4) to[short,-o] ++(-0.5,0)
-  (c.1) node[below left] {\texttt{1}}
-  (c.2) node[below right] {\texttt{2}}
-  (c.3) node[above right] {\texttt{3}}
-  (c.4) node[above left] {\texttt{4}}
-  ;
-\end{circuitikz}
-\end{LTXexample}
-		
+\noindent Q: How do I draw the voltage between two nodes?
+
+\noindent A: Between any two nodes there is an open circuit!
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz} \draw
-  (0,0) node[coupler2] (c) {\SI{3}{dB}}
-  (c.1) to[short,-o] ++(-0.5,0)
-  (c.2) to[short,-o] ++(0.5,0)
-  (c.3) to[short,-o] ++(0.5,0)
-  (c.4) to[short,-o] ++(-0.5,0)
-  (c.1) node[below left] {\texttt{1}}
-  (c.2) node[below right] {\texttt{2}}
-  (c.3) node[above right] {\texttt{3}}
-  (c.4) node[above left] {\texttt{4}}
-  ;
-\end{circuitikz}
+  node[ocirc] (A) at (0,0) {}
+  node[ocirc] (B) at (2,1) {}
+  (A) to[open, v=$v$] (B)
+;\end{circuitikz}
 \end{LTXexample}
 
+\bigskip
 
-\subsection{Input arrows}
-\subsubsection*{Two ports}
-With the option \texttt{>} you can draw an arrow to the input of the block diagram symbols.
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  (0,0) to[short,o-] ++(0.3,0)
-  to[lowpass,>] ++(2,0)
-  to[adc,>] ++(2,0)
-  to[short,-o] ++(0.3,0);
-\end{circuitikz}
-\end{LTXexample}
+\noindent Q: I cannot write \verb!to[R = $R_1=12V$]! nor \verb!to[ospst = open, 3s]!: I get errors.
 
+\noindent A: It is a limitation of the parser.
 
-\subsubsection*{Multi ports}
-Since inputs and outputs can vary, input arrows can be placed as nodes. Note that you have to rotate the arrow on your own:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  (0,0) node[mixer] (m) {}
-  (m.1) to[short,-o] ++(-1,0)
-  (m.2) to[short,-o] ++(0,-1)
-  (m.3) to[short,-o] ++(1,0)
-  (m.1) node[inputarrow] {}
-  (m.2) node[inputarrow,rotate=90] {};
-\end{circuitikz}
-\end{LTXexample}
+Use \verb|\def{\eq}{=}|  \verb!to[R = $R_1\eq 12V$]! and  \verb!to[ospst = open{,} 3s]! instead; see caveat in section~\ref{sec:labels-and-annotations}.
 
 
-\subsection{Labels and custom twoport boxes}
-Some twoports have the option to place a normal label (\texttt{l=}) and a inner label (\texttt{t=}).
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}
-  \ctikzset{bipoles/amp/width=0.9}
-  \draw (0,0) to[amp,t=LNA,l_=$F{=}0.9\,$dB,o-o] ++(3,0);
-\end{circuitikz}
-\end{LTXexample}
+\section{Defining new components}
 
+\begin{quote}
+    Per me si va ne la città dolente,\\
+    per me si va ne l'etterno dolore,\\
+    per me si va tra la perduta gente.\\
+    \dots\\
+    Lasciate ogne speranza, voi ch'intrate.%
+    \footnote{\url{https://classicsincontext.wordpress.com/2010/02/28/canto-iii-per-me-si-va-ne-la-citta-dolente/}}
+\end{quote}
 
-\subsection{Box option}
-Some devices have the possibility to add a box around them. The inner symbol scales down to fit inside the box.
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  (0,0) node[mixer,box,anchor=east] (m) {}
-    to[amp,box,>,-o] ++(2.5,0)
-  (m.west) node[inputarrow] {} to[short,-o] ++(-0.8,0)
-  (m.south) node[inputarrow,rotate=90] {} --
-    ++(0,-0.7) node[oscillator,box,anchor=north] {};
-\end{circuitikz}
-\end{LTXexample}
 
+\textbf{Big fat warning}: this material is reserved to \TeX-hackers; do not delve into this if you have no familiarity with (at least) a bit of core \TeX{} programming and to the basic \TikZ{} layer. You have been warned.
 
-\subsection{Dash optional parts}
-To show that a device is optional, you can dash it. The inner symbol will be kept with solid lines.
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}
-  \draw (0,0) to[amp,l=\SI{10}{dB}] ++(2.5,0);
-  \draw[dashed] (2.5,0) to[lowpass,l=opt.] ++(2.5,0);
-\end{circuitikz}
-\end{LTXexample}
 
-\subsection{Transistor paths}\label{sec:transasbip}
+\subsection{Suggested setup}
 
-For syntactical convenience transistors can be placed using the normal path notation used for bipoles. The transitor type can be specified by  simply adding a ``T'' (for transistor) in front of the node name of the transistor. It will be placed with the base/gate orthogonal to the direction of the path:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  (0,0) node[njfet] {1}
-  (-1,2) to[Tnjfet=2] (1,2) 
-    to[Tnjfet=3, mirror] (3,2);
-;\end{circuitikz}
-\end{LTXexample}
+The suggested way to start working on a new component is to use the utilities of the \Circuitikz{} manual for checking and testing your device. Basically, find (or download) the source code of the last version of \Circuitikz{} and find the file \texttt{ctikzmanutils.sty}; copy it in your directory and prepare a file like this:
 
-Access to the gate and/or base nodes can be gained by naming the transistors with the \texttt{n} or \texttt{name} path style:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw[yscale=1.1, xscale=.8]
-  (2,4.5) -- (0,4.5) to[Tpmos, n=p1] (0,3) 
-     to[Tnmos, n=n1] (0,1.5) 
-     to[Tnmos, n=n2] (0,0) node[ground] {}
-  (2,4.5) to[Tpmos,n=p2] (2,3) to[short, -*] (0,3)
-  (p1.G) -- (n1.G) to[short, *-o] ($(n1.G)+(3,0)$)
-  (n2.G) ++(2,0) node[circ] {} -| (p2.G)
-  (n2.G) to[short, -o] ($(n2.G)+(3,0)$)
-  (0,3) to[short, -o] (-1,3)
-;\end{circuitikz}
-\end{LTXexample}
+\begin{lstlisting}
+\documentclass[a4paper, titlepage]{article}
+\usepackage{a4wide}	%smaller borders
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\parindent=0pt
+\parskip=4pt plus 6pt minus 2pt
+\usepackage[siunitx, RPvoltages]{circuitikz}
+\usepackage{ctikzmanutils}
+\makeatletter
+%%  Test things here
+% defines
 
-The \texttt{name} property is available also for bipoles, although this is useful mostly for triac, potentiometer and thyristor (see~\ref{sec:othertrip}).
+% components
 
-\section{Customization}
+% paths
+\makeatother
 
-\subsection{Parameters}
+\begin{document}
 
-Pretty much all Circui\TikZ\ relies heavily on \texttt{pgfkeys} for value handling and configuration. Indeed, at the beginning of \texttt{circuitikz.sty} a series of key definitions can be found that modify all the graphical characteristics of the package.
+\circuitdescbip*{damper}{Mechanical damping\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
 
-All can be varied using the \verb!\ctikzset! command, anywhere in the code.
+\geolrcoord{dampershape, fill=yellow}
 
-\paragraph{Shape of the components} (on a per-component-class basis)
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) to[R=1<\ohm>] (2,0); \par
-\ctikzset{bipoles/resistor/height=.6}
-\tikz \draw (0,0) to[R=1<\ohm>] (2,0);
+\begin{LTXexample}[varwidth]
+\begin{circuitikz}
+    \draw (0,0) to[R] ++(2,0)
+    to[damper] ++(2,0);
+\end{circuitikz}
 \end{LTXexample}
+\end{document}
+\end{lstlisting}
 
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) node[nand port] {}; \par
-\ctikzset{tripoles/american nand port/input height=.2}
-\ctikzset{tripoles/american nand port/port width=.2}
-\tikz \draw (0,0) node[nand port] {};
-\end{LTXexample}
+This will compile in something like this (in this case, we are using a couple of existing components to check everything is ok):
 
-\paragraph{Thickness of the lines} (globally)
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) to[C=1<\farad>] (2,0); \par
-\ctikzset{bipoles/thickness=1}
-\tikz \draw (0,0) to[C=1<\farad>] (2,0);
-\end{LTXexample}
+\circuitdescbip*{damper}{Mechanical damping\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
 
+\geolrcoord{dampershape, fill=yellow}
 
-\paragraph{Global properties} Of voltage and current
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) to[R, v=1<\volt>] (2,0); \par
-\ctikzset{voltage/distance from node=.1}
-\tikz \draw (0,0) to[R, v=1<\volt>] (2,0);
+\begin{LTXexample}[varwidth]
+\begin{circuitikz}
+    \draw (0,0) to[R] ++(2,0)
+    to[damper] ++(2,0);
+\end{circuitikz}
 \end{LTXexample}
 
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) to[C, i=$\imath$] (2,0); \par
-\ctikzset{current/distance = .2}
-\tikz \draw (0,0) to[C, i=$\imath$] (2,0);
-\end{LTXexample}
+The command \verb|circuitdescbip*| is used to show the component description (you can check the definition and the usage looking at \texttt{ctikzmanutils.sty} file, and the \verb|\geolrcoord| is used to show the main anchors (geographical plus \texttt{left} and \texttt{right}) of the component.
 
-\noindent However, you can override the properties \verb!voltage/distance from node!\footnote{That is, how distant from the initial and final points of the path the arrow starts and ends.}, \verb!voltage/bump b!\footnote{Controlling how high the bump of the arrow is --- how curved it is.} and \verb!voltage/european label distance!\footnote{Controlling how distant from the bipole the voltage label will be.} on a per-component basis, in order to fine-tune the voltages:
+From now on, you can add the new commands for the component between the \verb|\makeatletter| and \verb|\makeatother| commands and, modifying the example, check the results.
 
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) to[R, v=1<\volt>] (1.5,0) 
-       to[C, v=2<\volt>] (3,0); \par
-\ctikzset{bipoles/capacitor/voltage/%
-     distance from node/.initial=.7}
-\tikz \draw (0,0) to[R, v=1<\volt>] (1.5,0)
-       to[C, v=2<\volt>] (3,0); \par
-\end{LTXexample}
+\subsection{Path-style component}
 
-\noindent Admittedly, not all graphical properties have understandable names, but for the time it will have to do:
-\begin{LTXexample}[varwidth=true]
-\tikz \draw (0,0) node[xnor port] {};
-\ctikzset{tripoles/american xnor port/aaa=.2}
-\ctikzset{tripoles/american xnor port/bbb=.6} 
-\tikz \draw (0,0) node[xnor port] {};
-\end{LTXexample}
+Let's define for example a path style component, like the one suggested by the user \texttt{@alex} on \href{https://tex.stackexchange.com/questions/484268/combined-spring-damper-in-circuitikz}{tex.stackexchange.com}. The component will be a mix of the \texttt{damper} and the \texttt{spring} components already present.
 
-\subsection{Components size}
-Perhaps the most important parameter is \verb!\circuitikzbasekey/bipoles/length!, which 
-can be interpreted as the length of a resistor (including reasonable connections): all other lenghts are relative to this value. For instance:
+The first step is to check if we can use the definition already existing for similar elements (for coherence of size) or if we need to define new ones; for this you have to check the file \texttt{pgfcirc.defines.tex}: we find
 
-\begin{LTXexample}[pos=t,varwidth=true]
-\ctikzset{bipoles/length=1.4cm} 
-\begin{circuitikz}[scale=1.2]\draw
-  (0,0) node[anchor=east] {B}
-        to[short, o-*] (1,0)
-        to[R=20<\ohm>, *-*] (1,2)
-        to[R=10<\ohm>, v=$v_x$] (3,2) -- (4,2)
-        to[cI=$\frac{\si{\siemens}}{5} v_x$, *-*] (4,0) -- (3,0)
-        to[R=5<\ohm>, *-*] (3,2)
-  (3,0) -- (1,0)
-  (1,2) to[short, -o] (0,2) node[anchor=east]{A}  
-;\end{circuitikz}
-\end{LTXexample}
+\begin{lstlisting}
+    \ctikzset{bipoles/spring/height/.initial=.5}
+    \ctikzset{bipoles/spring/width/.initial=.5}
+    \ctikzset{bipoles/damper/height/.initial=.35}
+    \ctikzset{bipoles/damper/length/.initial=.3}
+    \ctikzset{bipoles/damper/width/.initial=.4}
+\end{lstlisting}
 
-\begin{LTXexample}[pos=t,varwidth=true]
-\ctikzset{bipoles/length=.8cm} 
-\begin{circuitikz}[scale=1.2]\draw
-  (0,0) node[anchor=east] {B}
-        to[short, o-*] (1,0)
-        to[R=20<\ohm>, *-*] (1,2)
-        to[R=10<\ohm>, v=$v_x$] (3,2) -- (4,2)
-        to[cI=$\frac{\siemens}{5} v_x$, *-*] (4,0) -- (3,0)
-        to[R=5<\ohm>, *-*] (3,2)
-  (3,0) -- (1,0)
-  (1,2) to[short, -o] (0,2) node[anchor=east]{A}  
-;\end{circuitikz}
-\end{LTXexample}
+We will use them; at this stage you can decide to add other parameters if you need them. (Notice, however, than although flexibility is good, these parameters should be described in the manual, otherwise they're as good as a fixed number in the code).
 
-\subsection{Colors}
 
-The color of the components is stored in the key \verb!\circuitikzbasekey/color!. Circui\TikZ\ tries to follow the color set in \TikZ, although sometimes it fails. If you change color in the picture, please do not use just the color name as a style, like \verb![red]!, but rather assign the style \verb![color=red]!.
+To define the new component we will look into \texttt{pgfcircbipoles.tex} and we will copy, for example, the definition of the damper into our code, just changing the name:
 
-Compare for instance
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw[red]
-  (0,2) node[and port] (myand1)  {}
-  (0,0) node[and port] (myand2)  {}
-  (2,1) node[xnor port] (myxnor)  {}
-  (myand1.out) -| (myxnor.in 1)
-  (myand2.out) -| (myxnor.in 2)
-;\end{circuitikz}
-\end{LTXexample}
+\begin{lstlisting}
+%% mechanical resistor - damper
+\pgfcircdeclarebipole
+{}                                   % extra anchors
+{\ctikzvalof{bipoles/damper/height}} % depth (under the path line)
+{viscoe}                             % name
+{\ctikzvalof{bipoles/damper/height}} % height (above the path line)
+{\ctikzvalof{bipoles/damper/width}}  % width
+{ % draw the bipole
+    \pgfpathrectanglecorners{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgf@circ@maybefill
+
+    % line into the damper
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {\pgf@circ@res@zero}}
+    \pgfusepath{stroke}
+
+    % damper box
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+
+    \pgfsetrectcap
+    \pgfsetmiterjoin
+    \pgfusepath{stroke}
+
+    % damper vertical element
+    \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@up}}
+    \pgfsetbuttcap
+    \pgfusepath{stroke}
+}
+\end{lstlisting}
 
-and
+This command will define a shape that is named \texttt{viscoeshape}, with all the correct geographical anchors based on the depth, height and width defined in the parameters of \verb|\pgfcircdeclarebipole|. This is not sufficient for using the element in a \texttt{to[]} path command; you need to ``activate'' it with (this commands are normally in \texttt{pgfcircpath.tex}):
 
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw[color=red]
-  (0,2) node[and port] (myand1)  {}
-  (0,0) node[and port] (myand2)  {}
-  (2,1) node[xnor port] (myxnor)  {}
-  (myand1.out) -| (myxnor.in 1)
-  (myand2.out) -| (myxnor.in 2)
-;\end{circuitikz}
-\end{LTXexample}
+\begin{lstlisting}
+\def\pgf@circ@viscoe@path#1{\pgf@circ@bipole@path{viscoe}{#1}}
+\compattikzset{viscoe/.style = {\circuitikzbasekey,
+        /tikz/to path=\pgf@circ@dviscoe@path, l=#1}}
+\end{lstlisting}
 
-One can of course change the color \emph{in medias res}:
-\begin{LTXexample}[pos=t, varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) node[pnp, color=blue] (pnp2) {}
-  (pnp2.B) node[pnp, xscale=-1, anchor=B, color=brown] (pnp1) {}
-  (pnp1.C) node[npn, anchor=C, color=green] (npn1) {}
-  (pnp2.C) node[npn, xscale=-1, anchor=C, color=magenta] (npn2) {}
-  (pnp1.E) -- (pnp2.E)  (npn1.E) -- (npn2.E)
-  (pnp1.B) node[circ] {} |- (pnp2.C) node[circ] {}
-;\end{circuitikz}
-\end{LTXexample}
+And now you can show it with:
 
-The all-in-one stream of bipoles poses some challanges, as only the actual body of the bipole, and not the connecting lines, will be rendered in the specified color. Also, please notice the curly braces around the \texttt{to}:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0) to[V=1<\volt>] (0,2)
-      { to[R=1<\ohm>, color=red] (2,2) }
-        to[C=1<\farad>] (2,0) -- (0,0)
-;\end{circuitikz}
-\end{LTXexample}
+\begin{lstlisting}
+\circuitdescbip*{viscoe}{Mechanical viscoelastic element\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
 
-Which, for some bipoles, can be frustrating:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw 
-  (0,0){to[V=1<\volt>, color=red] (0,2) }
-        to[R=1<\ohm>] (2,2) 
-        to[C=1<\farad>] (2,0) -- (0,0)
-;\end{circuitikz}
-\end{LTXexample}
+\geolrcoord{viscoeshape, fill=yellow}
 
-The only way out is to specify different paths:
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw[color=red]
-  (0,0) to[V=1<\volt>, color=red] (0,2);
-  \draw (0,2) to[R=1<\ohm>] (2,2) 
-        to[C=1<\farad>] (2,0) -- (0,0)
-;\end{circuitikz}
+\begin{LTXexample}[varwidth]
+\begin{circuitikz}
+    \draw (0,0) to[spring] ++(2,0)
+    to[viscoe] ++(2,0);
+\end{circuitikz}
 \end{LTXexample}
+\end{lstlisting}
 
-And yes: this is a bug and \emph{not} a feature\ldots
+Obviously, at first you you just have a component that is the same as the one you copied with another name. It is now just a matter of modifying it so that it has the desired shape; in the example above you can already see the new symbol after the changes.
 
-\section{FAQ}
+When doing the drawing, the \verb|\pgfcircdeclarebipole| will setup the lengths \verb|\pgf@circ@res@right|
+and \verb|\pgf@circ@res@up| as the $x$-$y$ coordinates of the upper right corner, and
+\verb|\pgf@circ@res@left|  and \verb|\pgf@circ@res@down| as the $x$-$y$ coordinates of the lower left corner of your shape. The \texttt{center} coordinate is usually at $(0pt, 0pt)$.
 
-\noindent Q: When using \verb!\tikzexternalize! I get the following error:
-\begin{verbatim}
- ! Emergency stop.
-\end{verbatim}
+Looking at the implementation of the \texttt{spring} element, a possible implementation is changing the lines between  lines~12 and~16 with:
 
-\noindent A: The \TikZ\ manual states:
-\begin{quotation}
-Furthermore, the library assumes that all \LaTeX\ pictures are ended
-    with \verb!\end{tikzpicture}!.
-\end{quotation}
+\begin{lstlisting}
+    % spring into the damper
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfsetcornersarced{\pgfpoint{.25\pgf@circ@res@up}{.25\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.75\pgf@circ@res@left}{.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.5\pgf@circ@res@left}{-.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{-.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{.75\pgf@circ@res@up}}
+        \pgfusepath{stroke}
+    \endpgfscope
+\end{lstlisting}
+
+which leads to:
+
+\circuitdescbip*{viscoe}{Mechanical viscoelastic element\footnotemark}{}(left/135/0.2, right/45/0.2, center/-90/0.3)
+
+\geolrcoord{viscoeshape, fill=yellow}
+
+\begin{LTXexample}[varwidth]
+\begin{circuitikz}
+    \draw (0,0) to[spring] ++(2,0)
+    to[viscoe] ++(2,0);
+\end{circuitikz}
+\end{LTXexample}
 
-Just substitute every occurrence of the environment \verb!circuitikz! with \verb!tikzpicture!. They are actually pretty much the same.
 
-\bigskip
+As a final note, notice that the \texttt{viscoe} element is already added to the standard package.
 
-\noindent Q: How do I draw the voltage between two nodes?
+\subsection{Node-style component}
 
-\noindent A: Between any two nodes there is an open circuit!
-\begin{LTXexample}[varwidth=true]
-\begin{circuitikz} \draw
-  node[ocirc] (A) at (0,0) {}
-  node[ocirc] (B) at (2,1) {}
-  (A) to[open, v=$v$] (B)
-;\end{circuitikz}
-\end{LTXexample}
+Adding a node-style component is much more straightforward. Just define it by following examples in, for example, \texttt{pgfcirctripoles.tex} or the other files; be careful that you should define all the geographical anchors of the shape if you want that the \TikZ{} positioning options (like \texttt{left}, \texttt{above}, etc.) behave correctly with your component.
 
-\bigskip
+\subsubsection{Finishing your work}
 
-\noindent Q: I cannot write \verb!to[R = $R_1=12V$]! nor \verb!to[ospst = open, 3s]!: I get errors.
+Once you have a satisfactory element, you should
+\begin{itemize}
+    \item Clean up your code;
+    \item write a piece of documentation explaining its use with example;
+    \item Propose the element for inclusion in the GitHub page of the project (you will have to license this as explained in that page, of course).
+\end{itemize}
+
+The best way of contributing is forking the project, adding your component in the correct files, modify the manual and creating a pull request for the developers to merge. Anyway, if this is a problem, just open an issue and someone (when they have time\dots) will answer.
 
-\noindent A: It is a limitation of the \TikZ\ parser. Use \verb!to[R = $R_1{=}12V$]! and \verb!to[ospst = open{,} 3s]! instead.
 
 
 \section{Examples}
+
 \begin{LTXexample}[pos=t,varwidth=true]
 \begin{circuitikz}[scale=1.4]\draw
   (0,0) to[C, l=10<\micro\farad>] (0,2) -- (0,3)
         to[R, l=2.2<\kilo\ohm>] (4,3) -- (4,2)
         to[L, l=12<\milli\henry>, i=$i_1$,v=b] (4,0) -- (0,0)
   (4,2) { to[D*, *-*, color=red] (2,0) }
-  (0,2) to[R, l=1<\kilo\ohm>, *-] (2,2) 
+  (0,2) to[R, l=1<\kilo\ohm>, *-] (2,2)
         to[cV, i=1,v=$\SI{.3}{\kilo\ohm} i_1$] (4,2)
-  (2,0) to[I, i=1<\milli\ampere>, -*] (2,2) 
+  (2,0) to[I, i=1<\milli\ampere>, -*] (2,2)
 ;\end{circuitikz}
 \end{LTXexample}
 
@@ -2088,7 +3985,7 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
   (5,0) to[I, i_=$a(t)$, -*] (5,2) -- (4,2)
   (0,0) -- (5,0)
   (0,2) -- (0,3) to[L, l=2<\milli\henry>] (5,3) -- (5,2)
- 
+
  {[anchor=south east] (0,2) node {1} (2,2) node {2} (4,2) node {3}}
 ;\end{circuitikz}
 \end{LTXexample}
@@ -2102,10 +3999,10 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
         to[cI=$\frac{\siemens}{5} v_x$, *-*] (4,0) -- (3,0)
         to[R=5<\ohm>, *-*] (3,2)
   (3,0) -- (1,0)
-  (1,2) to[short, -o] (0,2) node[anchor=east]{A}  
+  (1,2) to[short, -o] (0,2) node[anchor=east]{A}
 ;\end{circuitikz}
 \end{LTXexample}
- 
+
 \begin{LTXexample}[pos=t,varwidth=true]
 \begin{circuitikz}[scale=1]\draw
 	(0,0) node[transformer] (T) {}
@@ -2117,16 +4014,16 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
 
 \begin{LTXexample}[pos=t,varwidth=true]
 \begin{circuitikz}[scale=1]\draw
-	(5,.5) node [op amp] (opamp) {}
-	(0,0) node [left] {$U_{we}$} to [R, l=$R_d$, o-*] (2,0)
-	to [R, l=$R_d$, *-*] (opamp.+)
-	to [C, l_=$C_{d2}$, *-] ($(opamp.+)+(0,-2)$) node [ground] {}
-	(opamp.out) |- (3.5,2) to [C, l_=$C_{d1}$, *-] (2,2) to [short] (2,0)
-	(opamp.-) -| (3.5,2)
-	(opamp.out) to [short, *-o] (7,.5) node [right] {$U_{wy}$}
+    (5,.5) node [op amp] (opamp) {}
+    (0,0) node [left] {$U_{we}$} to [R, l=$R_d$, o-*] (2,0)
+    to [R, l=$R_d$, *-*] (opamp.+)
+    to [C, l_=$C_{d2}$, *-] ($(opamp.+)+(0,-2)$) node [ground] {}
+    (opamp.out) |- (3.5,2) to [C, l_=$C_{d1}$, *-] (2,2) to [short] (2,0)
+    (opamp.-) -| (3.5,2)
+    (opamp.out) to [short, *-o] (7,.5) node [right] {$U_{wy}$}
 ;\end{circuitikz}
 \end{LTXexample}
- 
+
 \begin{LTXexample}[pos=t,varwidth=true]
 \begin{circuitikz}[scale=1.2, american]\draw
   (0,2) to[I=1<\milli\ampere>] (2,2)
@@ -2142,44 +4039,44 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
     \draw [->] (-2,0) -- (2.5,0) node[anchor=west] {$v_1/\volt$};
     \draw [->] (0,-2) -- (0,2) node[anchor=west] {$i_1/\SI{}{\milli\ampere}$} ;
     \draw (-1,0) node[anchor=north] {-2} (1,0) node[anchor=south] {2}
-          (0,1) node[anchor=west] {4} (0,-1) node[anchor=east] {-4} 
+          (0,1) node[anchor=west] {4} (0,-1) node[anchor=east] {-4}
           (2,0) node[anchor=north west] {4}
           (-1.5,0) node[anchor=south east] {-3};
     \draw [thick] (-2,-1) -- (-1,1) -- (1,-1) -- (2,0) -- (2.5,.5);
-    \draw [dotted] (-1,1) -- (-1,0) (1,-1) -- (1,0) 
+    \draw [dotted] (-1,1) -- (-1,0) (1,-1) -- (1,0)
           (-1,1) -- (0,1) (1,-1) -- (0,-1);
-   \end{scope}  
+   \end{scope}
 \end{circuitikz}
 \end{LTXexample}
 
 \begin{LTXexample}[pos=t,varwidth=true]
-	\begin{circuitikz}[scale=1]
-		\ctikzset{bipoles/detector/width=.35}
-		\ctikzset{quadpoles/coupler/width=1}
-		\ctikzset{quadpoles/coupler/height=1}
-		\ctikzset{tripoles/wilkinson/width=1}
-		\ctikzset{tripoles/wilkinson/height=1}
-		%\draw[help lines,red,thin,dotted] (0,-5) grid (5,5);
-		\draw
-		(-2,0) node[wilkinson](w1){}
-		(2,0) node[coupler] (c1) {}
-		(0,2) node[coupler,rotate=90] (c2) {}
-		(0,-2) node[coupler,rotate=90] (c3) {}
-		(w1.out1) .. controls ++(0.8,0) and ++(0,0.8) .. (c3.3)
-		(w1.out2) .. controls ++(0.8,0) and ++(0,-0.8) .. (c2.4)
-		(c1.1) .. controls ++(-0.8,0) and ++(0,0.8) .. (c3.2)
-		(c1.4) .. controls ++(-0.8,0) and ++(0,-0.8) .. (c2.1)
-		(w1.in) to[short,-o] ++(-1,0)
-		(w1.in) node[left=30] {LO}
-		(c1.2) node[match,yscale=1] {}
-		(c1.3) to[short,-o] ++(1,0)
-		(c1.3) node[right=30] {RF}
-		(c2.3) to[detector,-o] ++(0,1.5)
-		(c2.2) to[detector,-o] ++(0,1.5)
-		(c3.1) to[detector,-o] ++(0,-1.5)
-		(c3.4) to[detector,-o] ++(0,-1.5)
-		;
-	\end{circuitikz}
+    \begin{circuitikz}[scale=1]
+        \ctikzset{bipoles/detector/width=.35}
+        \ctikzset{quadpoles/coupler/width=1}
+        \ctikzset{quadpoles/coupler/height=1}
+        \ctikzset{tripoles/wilkinson/width=1}
+        \ctikzset{tripoles/wilkinson/height=1}
+        %\draw[help lines,red,thin,dotted] (0,-5) grid (5,5);
+        \draw
+        (-2,0) node[wilkinson](w1){}
+        (2,0) node[coupler] (c1) {}
+        (0,2) node[coupler,rotate=90] (c2) {}
+        (0,-2) node[coupler,rotate=90] (c3) {}
+        (w1.out1) .. controls ++(0.8,0) and ++(0,0.8) .. (c3.3)
+        (w1.out2) .. controls ++(0.8,0) and ++(0,-0.8) .. (c2.4)
+        (c1.1) .. controls ++(-0.8,0) and ++(0,0.8) .. (c3.2)
+        (c1.4) .. controls ++(-0.8,0) and ++(0,-0.8) .. (c2.1)
+        (w1.in) to[short,-o] ++(-1,0)
+        (w1.in) node[left=30] {LO}
+        (c1.2) node[match,yscale=1] {}
+        (c1.3) to[short,-o] ++(1,0)
+        (c1.3) node[right=30] {RF}
+        (c2.3) to[detector,-o] ++(0,1.5)
+        (c2.2) to[detector,-o] ++(0,1.5)
+        (c3.1) to[detector,-o] ++(0,-1.5)
+        (c3.4) to[detector,-o] ++(0,-1.5)
+        ;
+    \end{circuitikz}
 \end{LTXexample}
 
 
@@ -2194,7 +4091,7 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
 \usetikzlibrary{circuits.ee.IEC}
 \usetikzlibrary{positioning}
 
-\usepackage[compatibility]{circuitikz}
+\usepackage[compatibility]{circuitikzgit}
 \ctikzset{bipoles/length=.9cm}
 
 \begin{document}
@@ -2211,7 +4108,7 @@ Just substitute every occurrence of the environment \verb!circuitikz! with \verb
 % % changelog.tex will be updated by makefile from CHANGELOG.md
 \section{Changelog}
 \IfFileExists{changelog.tex}
-{\input{changelog.tex}}
+{\sloppy\input{changelog.tex}}
 {The file changelog.tex was not found, run 'make changelog' at toplevel to generate it with pandoc from CHANGELOG.md}
 
 \printindex
diff --git a/Master/texmf-dist/doc/latex/circuitikz/compatibility.tex b/Master/texmf-dist/doc/latex/circuitikz/compatibility.tex
index 7259479e78b..0f789cb1c67 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/compatibility.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/compatibility.tex
@@ -4,7 +4,7 @@
 \usetikzlibrary{circuits.ee.IEC}
 \usetikzlibrary{positioning}
 
-\usepackage[compatibility]{circuitikz}
+\usepackage[compatibility, RPvoltages]{circuitikz}
 \ctikzset{bipoles/length=.9cm}
 
 \begin{document}
diff --git a/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty b/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty
new file mode 100644
index 00000000000..6e773c3c570
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty
@@ -0,0 +1,123 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{ctikzmanutils}[2019/04/14 utilities for formatting circuitikz manual]
+\RequirePackage{ifthen}
+\RequirePackage{xparse}
+\RequirePackage{showexpl}
+%
+% The following trick is used to silence showexpl a bit, so that the
+% logs are readable...
+%
+\makeatletter
+\let\SX@Info=\relax % silence showexpl a bit...
+\makeatother
+%
+\lstset{pos=l,width=-99pt, overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,
+    rframe=single,numbers=left,numberstyle=\tiny,numbersep=.3em, xleftmargin=1em,
+    columns=flexible, language=[LaTeX]TEX,breaklines=true,
+    basicstyle=\normalsize\ttfamily,tabsize=3}
+
+%
+% draw the shape without affecting anything
+\newcommand{\drawphantomshape}[1] {%
+    {\tikz [overlay, color=blue] \path (0,0) node[#1]{};}
+}
+%% New circuit description macros
+\newcommand{\twopartbox}[2]{%
+    \leavevmode\null\par\noindent\fbox{\parbox[c]{0.3\linewidth}{#1} \parbox[c]{0.6\linewidth}{\raggedright #2}\par\noindent}%
+}
+% filling color for filled-enabled component
+\colorlet{fillcol}{cyan!30!white}
+% description of a node component:
+% optional star for fillable
+% optional: scale of the component in the entry
+% mandatory  shape name, description, node text:
+% optional between (): anchor specification list
+\NewDocumentCommand{\circuitdesc}{s O{1} m m m d()}
+{
+    \twopartbox{%
+        \begin{circuitikz}[]
+            \IfBooleanTF{#1}{%
+                \draw (0,0) node[#3,scale=#2, fill=fillcol](N){#5};
+                }{
+                \draw (0,0) node[#3,scale=#2](N){#5};
+            }
+            \IfValueT{#6}{%
+                \foreach \n/\a/\d in {#6} \path(N.\n) \showcoord(\n)<\a:\d>;
+            }
+        \end{circuitikz}%
+        }{\sloppy%
+        {#4, type: node\IfBooleanT{#1}{, fillable}%
+    } (\texttt{node[#3]\{#5\}}) \index{#3} }
+}
+% description of a path-style component:
+% optional: main name, if different from above
+% mandatory component name, description, comma separated alias
+% optional between (): anchor specification list
+\NewDocumentCommand{\circuitdescbip}{s o m m m d()}
+{
+\index{#3} \tikz\foreach \i in {#5} {\index{\i|see{#3}} };
+    \twopartbox{%
+        \begin{circuitikz}
+        \IfBooleanTF{#1}{%
+            \draw (0,0) to[#3, name=B, fill=fillcol] (2,0);
+            }{
+            \draw (0,0) to[#3, name=B] (2,0);
+        }
+        \IfValueT{#6}{%
+                \foreach \n/\a/\d in {#6} \path(B.\n) \showcoord(\n)<\a:\d>;
+            }
+        \end{circuitikz}%
+        }{\sloppy%
+        \texttt{\textbf{#3}}: #4, \texttt{type: path-style\IfBooleanT{#1}{, fillable}%
+            \IfValueTF{#2}{%
+                , nodename: #2shape.%\drawphantomshape{#2shape}%
+            }{
+                , nodename: #3shape.%\drawphantomshape{#3shape}%
+            }
+        }%
+        \ifthenelse{\equal{#5}{}}{}{%
+        Aliases: \texttt{#5}.}%
+    }
+}
+
+
+%new environment for grouping descriptions
+\newenvironment{groupdesc}{\medskip\begingroup}{\endgroup\par\medskip\par\noindent}
+
+% command to show anchors: (name)<angle>
+% usage in path: \path (anchor) \coord(anchor)<60>
+\makeatletter % we use the internal circuitikz base length
+\def\showcoord(#1)<#2:#3>{%
+    node[circle, red, draw, inner sep=1pt,pin={%
+        [red, inner sep=0.5pt, font=\small,
+        pin distance=#3\pgf@circ@Rlen, pin edge={red, }%
+    ]#2:#1}](#1){}}
+\makeatother
+% show anchors of a node component:
+% optional: options of the circuitikz environment
+% mandatory  node spec, node text
+% optional between (): anchor specification list
+\NewDocumentCommand{\showanchors}{O{} m m d()}
+{
+        \begin{circuitikz}[#1]
+                \draw (0,0) node[#2](N){#3};
+            \IfValueT{#4}{%
+                \foreach \n/\a/\d in {#4} \path(N.\n) \showcoord(\n)<\a:\d>;
+            }
+        \end{circuitikz}%
+}
+
+
+\def\geolrcoord#1{\showanchors{#1}{text}(north/90/0.4, north east/45/0.4, east/0/0.4,
+    south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4,
+    left/160/0.4, right/30/0.4, center/-120/0.3
+    )
+}
+
+\def\geocoord#1{\showanchors{#1}{text}(north/90/0.4, north east/45/0.4, east/0/0.4,
+    south east/-45/0.4,
+    south/-90/0.4, south west/-135/0.4, west/180/0.4, north west/135/0.4,
+    center/-120/0.3
+    )
+}
diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
index 2281f120d24..04310f66fa6 100644
--- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
+++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
@@ -1,12 +1,12 @@
-\def\pgfcircversion{0.8.3}
-\def\pgfcircversiondate{2017/05/28}
+\def\pgfcircversion{0.9.0}
+\def\pgfcircversiondate{2019/05/10}
 \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
 
 \usemodule[tikz]
 
 \startmodule[circuitikz]
 \usetikzlibrary[calc]
-\usetikzlibrary[arrows]
+\usetikzlibrary[arrows.meta, bending]
 
 \unprotect
 
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
index 3d7d61c7bc6..8814c336a4f 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
@@ -15,6 +15,68 @@
 \newdimen\pgf@circ@res@temp
 % inital thickness
 \newdimen \pgfstartlinewidth
+
+% arrow tips, ported over old arrows library (deprecated)
+% see https://tex.stackexchange.com/questions/234084/latex-arrow-tip-with-arrows-meta-library
+% this was the original definition of latex' tips, renamed to avoid clashes
+%
+\pgfarrowsdeclare{latexslim}{latexslim}
+{
+  \pgfutil@tempdima=0.28pt%
+  \advance\pgfutil@tempdima by.3\pgflinewidth%
+  \pgfarrowsleftextend{+-4\pgfutil@tempdima}
+  \pgfarrowsrightextend{+6\pgfutil@tempdima}
+}
+{
+  \pgfutil@tempdima=0.28pt%
+  \advance\pgfutil@tempdima by.3\pgflinewidth%
+  \pgfpathmoveto{\pgfqpoint{6\pgfutil@tempdima}{0\pgfutil@tempdima}}
+  \pgfpathcurveto
+  {\pgfqpoint{3.5\pgfutil@tempdima}{.5\pgfutil@tempdima}}
+  {\pgfqpoint{-1\pgfutil@tempdima}{1.5\pgfutil@tempdima}}
+  {\pgfqpoint{-4\pgfutil@tempdima}{3.75\pgfutil@tempdima}}
+  \pgfpathcurveto
+  {\pgfqpoint{-1.5\pgfutil@tempdima}{1\pgfutil@tempdima}}
+  {\pgfqpoint{-1.5\pgfutil@tempdima}{-1\pgfutil@tempdima}}
+  {\pgfqpoint{-4\pgfutil@tempdima}{-3.75\pgfutil@tempdima}}
+  \pgfpathcurveto
+  {\pgfqpoint{-1\pgfutil@tempdima}{-1.5\pgfutil@tempdima}}
+  {\pgfqpoint{3.5\pgfutil@tempdima}{-.5\pgfutil@tempdima}}
+  {\pgfqpoint{6\pgfutil@tempdima}{0\pgfutil@tempdima}}
+  \pgfpathclose
+  \pgfusepathqfill
+}
+
+\pgfarrowsdeclarereversed{latexslim reversed}{latexslim reversed}{latexslim}{latexslim}
+
+%% Macro to fill or draw
+
+\def\pgf@circ@draworfill{%
+    \ifx\tikz@fillcolor\pgfutil@empty
+        \pgfusepath{draw}
+    \else
+        \pgfsetfillcolor{\tikz@fillcolor}
+        \pgfusepath{draw, fill}
+    \fi
+}
+
+\def\pgf@circ@draworfillandclip{%
+    \ifx\tikz@fillcolor\pgfutil@empty
+        \pgfusepath{draw, clip}
+    \else
+        \pgfsetfillcolor{\tikz@fillcolor}
+        \pgfusepath{draw, clip, fill}
+    \fi
+}
+
+\def\pgf@circ@maybefill{%
+    \ifx\tikz@fillcolor\pgfutil@empty
+        \pgfusepath{discard}
+    \else
+        \pgfsetfillcolor{\tikz@fillcolor}
+        \pgfusepath{fill}
+    \fi
+}
 %% Keys
 
 \long\def\pgf@circ@comment#1{}
@@ -30,7 +92,17 @@
 
 \newif\ifpgf@circ@siunitx
 \newif\ifpgf@circuit@compat
-\newif\ifpgf@circ@oldvoltagedirection
+\newif\ifpgf@circ@oldvoltagedirection % default false
+\newif\ifpgf@circ@explicitvdir
+\newif\ifpgf@circ@fixbatteries
+
+\ctikzset{voltage dir/.is choice}
+\ctikzset{voltage dir/old/.code={\pgf@circ@oldvoltagedirectiontrue\pgf@circ@fixbatteriesfalse}}
+\ctikzset{voltage dir/noold/.code={\pgf@circ@oldvoltagedirectionfalse\pgf@circ@fixbatteriesfalse}}
+\ctikzset{voltage dir/RP/.code={\pgf@circ@oldvoltagedirectiontrue\pgf@circ@fixbatteriestrue}}
+\ctikzset{voltage dir/EF/.code={\pgf@circ@oldvoltagedirectionfalse\pgf@circ@fixbatteriestrue}}
+\tikzset{voltage dir/.style={circuitikz/voltage dir=#1}}
+
 
 % Option ">" for twoports
 \newif\ifpgf@circuit@inputarrow
@@ -54,34 +126,60 @@
 % Option "t=*" for nodes
 \pgfkeys{/tikz/t/.add code={}{\ctikzset{text=#1}}}
 
-
+\ctikzset{current arrow scale/.initial=16}
 
 \ctikzset{bipoles/.is family}
 \ctikzset{bipoles/border margin/.initial=1.1}
-\ctikzset{bipoles/thickness/.initial=2} 
+\ctikzset{bipoles/thickness/.initial=2}
+\ctikzset{tripoles/thickness/.initial=2}
+\ctikzset{quadpoles/thickness/.initial=2}
 \ctikzset{nodes width/.initial=.04}
-\newdimen\pgf@circ@Rlen 
+
+% Base len for all circuitikz
+\newdimen\pgf@circ@Rlen
 \ctikzset{bipoles/length/.code={\pgf@circ@Rlen = #1}}
 \pgf@circ@Rlen = 1.4cm
 
 \ctikzset{monopoles/.is family}
 \ctikzset{monopoles/ground/width/.initial=.25}
+\ctikzset{monopoles/ground/connectionthickness/.initial=1}
+\ctikzset{monopoles/ground/thickness/.initial=2}
+\ctikzset{monopoles/rground/thickness/.initial=2}
 \ctikzset{monopoles/tground/thickness/.initial=3}
 \ctikzset{monopoles/vcc/width/.initial=.2}
 \ctikzset{monopoles/match/width/.initial=.4}
 \ctikzset{monopoles/chassis/width/.initial=.25}
 \ctikzset{monopoles/alternative chassis/width/.initial=.25}
 \ctikzset{monopoles/equipotentiality/width/.initial=.25}
-\ctikzset{monopoles/tlinestub/width/.initial=.25}          
-\ctikzset{monopoles/antenna/width/.initial=.25}            
-\ctikzset{monopoles/antenna/label/xanchor/.initial=.4}            
-\ctikzset{monopoles/antenna/label/yanchor/.initial=.75}            
-\ctikzset{monopoles/txantenna/label/xanchor/.initial=.4}            
-\ctikzset{monopoles/txantenna/label/yanchor/.initial=.75}            
+\ctikzset{monopoles/tlinestub/width/.initial=.25}
+\ctikzset{monopoles/antenna/width/.initial=.25}
+\ctikzset{monopoles/antenna/label/xanchor/.initial=.4}
+\ctikzset{monopoles/antenna/label/yanchor/.initial=.75}
+\ctikzset{monopoles/txantenna/label/xanchor/.initial=.4}
+\ctikzset{monopoles/txantenna/label/yanchor/.initial=.75}
 \ctikzset{monopoles/txantenna/width/.initial=.25}
-\ctikzset{monopoles/rxantenna/label/xanchor/.initial=.4}            
-\ctikzset{monopoles/rxantenna/label/yanchor/.initial=.75}            
+\ctikzset{monopoles/rxantenna/label/xanchor/.initial=.4}
+\ctikzset{monopoles/rxantenna/label/yanchor/.initial=.75}
 \ctikzset{monopoles/rxantenna/width/.initial=.25}
+\ctikzset{monopoles/bareantenna/width/.initial=.25}
+\ctikzset{monopoles/bareantenna/label/xanchor/.initial=1}
+\ctikzset{monopoles/bareantenna/label/yanchor/.initial=0.5}
+\ctikzset{monopoles/waves/width/.initial=0.5}
+% microstrips
+\ctikzset{bipoles/mstline/height/.initial=0.3}
+\ctikzset{bipoles/mstline/width/.initial=1.2}
+\pgfkeys{/tikz/mstlinelen/.add code={}{\ctikzset{bipoles/mstline/width=#1}}}
+\ctikzset{monopoles/msport/width/.initial=.5}
+\ctikzset{monopoles/msrstub/height/.initial=1.0}
+\ctikzset{monopoles/msrstub/width/.initial=0.6}
+
+% microphone and loudspeaker
+\ctikzset{bipoles/loudspeaker/height/.initial=.8}
+\ctikzset{bipoles/loudspeaker/depth/.initial=.3}
+\ctikzset{bipoles/loudspeaker/width/.initial=.8}
+\ctikzset{bipoles/mic/height/.initial=1.2}
+\ctikzset{bipoles/mic/depth/.initial=.0}
+\ctikzset{bipoles/mic/width/.initial=.8}
 
 \ctikzset{bipoles/resistor/height/.initial=.3}
 \ctikzset{bipoles/resistor/width/.initial=.8}
@@ -108,17 +206,29 @@
 \ctikzset{bipoles/vresistor/height/.initial=.6}
 \ctikzset{bipoles/vresistor/width/.initial=.8}
 \ctikzset{bipoles/cuteinductor/height/.initial=.3}
-\ctikzset{bipoles/cuteinductor/lower coil height/.initial=.15}	
+\ctikzset{bipoles/cuteinductor/lower coil height/.initial=.15}
 \ctikzset{bipoles/cuteinductor/width/.initial=.6}
 \ctikzset{bipoles/cuteinductor/coils/.initial=5}
 \ctikzset{bipoles/cuteinductor/coil aspect/.initial=.5}%percentage of inductor width, which is covered by lower coil
+%% Cute choke settings
+\ctikzset{bipoles/cutechoke/height/.initial=.3}
+\ctikzset{bipoles/cutechoke/lower coil height/.initial=.15}
+\ctikzset{bipoles/cutechoke/width/.initial=.6}
+\ctikzset{bipoles/cutechoke/coils/.initial=5}
+\ctikzset{bipoles/cutechoke/coil aspect/.initial=.5}%percentage of choke width, which is covered by lower coil
+\ctikzset{bipoles/cutechoke/cstep/.initial=.3}
+\ctikzset{bipoles/cutechoke/cdist/.initial=1.3}
+\ctikzset{bipoles/cutechoke/cthick/.initial=1}
+\newif\ifpgf@circuit@bipole@twolines
+\pgf@circuit@bipole@twolinesfalse
+%
 \ctikzset{bipoles/americaninductor/height/.initial=.3}
 \ctikzset{bipoles/americaninductor/height 2/.initial=.1}
 \ctikzset{bipoles/americaninductor/width/.initial=.8}
 \ctikzset{bipoles/americaninductor/coils/.initial=4}
 \ctikzset{bipoles/americaninductor/coil height/.initial=.15}
 \ctikzset{bipoles/vcuteinductor/height/.initial=.6}
-\ctikzset{bipoles/vcuteinductor/lower coil height/.initial=.3}	
+\ctikzset{bipoles/vcuteinductor/lower coil height/.initial=.3}
 \ctikzset{bipoles/vcuteinductor/width/.initial=.6}
 \ctikzset{bipoles/vcuteinductor/coils/.initial=5}
 \ctikzset{bipoles/vcuteinductor/coil aspect/.initial=.5}%percentage of inductor width, which is covered by lower coil
@@ -190,6 +300,10 @@
 \ctikzset{bipoles/battery2/width/.initial=.3}
 \ctikzset{bipoles/diode/height/.initial=.50}
 \ctikzset{bipoles/diode/width/.initial=.40}
+\ctikzset{bipoles/bidirectionaldiode/height/.initial=1.1}
+\ctikzset{bipoles/bidirectionaldiode/width/.initial=1}
+\ctikzset{bipoles/bidirectionaldiode/diode width left/.initial=.3}
+\ctikzset{bipoles/bidirectionaldiode/diode width right/.initial=.3}
 \ctikzset{bipoles/varcap/height/.initial=.50}
 \ctikzset{bipoles/varcap/width/.initial=.45}
 \ctikzset{bipoles/spst/height/.initial=.35}
@@ -197,8 +311,10 @@
 \ctikzset{bipoles/spst/depth/.initial=.2}
 \ctikzset{bipoles/nos/height/.initial=.3}
 \ctikzset{bipoles/nos/width/.initial=.35}
+\ctikzset{bipoles/nos/depth/.initial=.2}
 \ctikzset{bipoles/ncs/height/.initial=.35}
 \ctikzset{bipoles/ncs/width/.initial=.35}
+\ctikzset{bipoles/ncs/depth/.initial=.2}
 \ctikzset{bipoles/generic/height/.initial=.30}
 \ctikzset{bipoles/generic/width/.initial=.80}
 \ctikzset{bipoles/european gas filled surge arrester/height/.initial=.30}
@@ -242,6 +358,15 @@
 \ctikzset{bipoles/ohmmeter/width/.initial=.60}
 \ctikzset{bipoles/voltmeter/height/.initial=.60}
 \ctikzset{bipoles/voltmeter/width/.initial=.60}
+\ctikzset{bipoles/smeter/height/.initial=.60}
+\ctikzset{bipoles/smeter/width/.initial=.60}
+\ctikzset{bipoles/qmeter/depth/.initial=.40}
+\ctikzset{bipoles/qmeter/height/.initial=.80}
+\ctikzset{bipoles/qmeter/width/.initial=.60}
+\ctikzset{bipoles/iloop/width/.initial=.40}
+\ctikzset{bipoles/iloop/height/.initial=.60}
+\ctikzset{bipoles/oscope/height/.initial=.60}
+\ctikzset{bipoles/oscope/width/.initial=.60}
 \ctikzset{bipoles/buffer/height/.initial=1}
 \ctikzset{bipoles/buffer/width/.initial=1}
 \ctikzset{bipoles/not port/width/.initial=1}
@@ -249,6 +374,8 @@
 \ctikzset{bipoles/not port/circle width/.initial=.15}
 \ctikzset{bipoles/lamp/height/.initial=.60}
 \ctikzset{bipoles/lamp/width/.initial=.60}
+\ctikzset{bipoles/bulb/height/.initial=.8}
+\ctikzset{bipoles/bulb/width/.initial=.8}
 \ctikzset{bipoles/tline/height/.initial=.3}
 \ctikzset{bipoles/tline/width/.initial=.8}
 \ctikzset{bipoles/squid/height/.initial=.60}
@@ -259,7 +386,7 @@
 \ctikzset{bipoles/thermocouple/height 2/.initial=.60}
 \ctikzset{bipoles/thermocouple/width/.initial=.140}
 \ctikzset{bipoles/pushbutton/height/.initial=.5}
-\ctikzset{bipoles/pushbutton/height 2/.initial=.0}
+\ctikzset{bipoles/pushbutton/height 2/.initial=.2}
 \ctikzset{bipoles/pushbutton/width/.initial=.50}
 
 \ctikzset{bipoles/twoport/width/.initial=.7}
@@ -283,7 +410,12 @@
 \ctikzset{bipoles/phaseshifter/width/.initial=.7}
 \ctikzset{bipoles/vphaseshifter/width/.initial=.7}
 \ctikzset{bipoles/detector/width/.initial=.7}
+% resistive sensor american style
+\ctikzset{bipoles/resistivesens/height/.initial=.6}
+\ctikzset{bipoles/resistivesens/width/.initial=.8}
 
+% crossing wires
+\ctikzset{bipoles/crossing/size/.initial=.2}
 
 \newif\ifpgf@circuit@trans@depletiontype
 \pgf@circuit@trans@depletiontypefalse
@@ -293,14 +425,14 @@
 \ctikzset{tripoles/mos style/no arrows/.code={\pgf@circuit@mos@arrowsfalse}}
 \ctikzset{tripoles/mos style/arrows/.code={\pgf@circuit@mos@arrowstrue}}
 
-% Option solderdot for fet 
+% Option solderdot for fet
 \newif\ifpgf@circuit@fet@solderdot
 \pgfkeys{/tikz/solderdot/.add code={}{\pgf@circuit@fet@solderdottrue}}
 \ctikzset{solderdot/.add code={}{\pgf@circuit@fet@solderdottrue}}
 \pgfkeys{/tikz/nosolderdot/.add code={}{\pgf@circuit@fet@solderdotfalse}}
 \ctikzset{nosolderdot/.add code={}{\pgf@circuit@fet@solderdotfalse}}
 
-% Option bodydiode for fet 
+% Option bodydiode for fet
 \newif\ifpgf@circuit@fet@bodydiode
 \pgfkeys{/tikz/bodydiode/.add code={}{\pgf@circuit@fet@bodydiodetrue}}
 \ctikzset{bodydiode/.add code={}{\pgf@circuit@fet@bodydiodetrue}}
@@ -350,6 +482,7 @@
 \ctikzset{tripoles/nmos/height/.initial=1.1}
 \ctikzset{tripoles/nmos/base width/.initial=.5}
 \ctikzset{tripoles/nmos/gate width/.initial=.62}
+\ctikzset{tripoles/nmos/arrow pos/.initial=.6}
 \ctikzset{tripoles/nmos/bodydiode scale/.initial=.3}
 \ctikzset{tripoles/nmos/bodydiode distance/.initial=.3}
 \ctikzset{tripoles/nmos/bodydiode conn/.initial=.6}
@@ -362,11 +495,24 @@
 \ctikzset{tripoles/pmos/height/.initial=1.1}
 \ctikzset{tripoles/pmos/base width/.initial=.5}
 \ctikzset{tripoles/pmos/gate width/.initial=.62}
+\ctikzset{tripoles/pmos/arrow pos/.initial=.4}
 \ctikzset{tripoles/pmos/bodydiode scale/.initial=.3}
 \ctikzset{tripoles/pmos/bodydiode distance/.initial=.3}
 \ctikzset{tripoles/pmos/bodydiode conn/.initial=.6}
 \ctikzset{tripoles/pmos/curr direction/.initial=-1}
 
+\ctikzset{tripoles/hemt/width/.initial=.7}
+\ctikzset{tripoles/hemt/gate height/.initial=.35}
+\ctikzset{tripoles/hemt/base height/.initial=.5}
+\ctikzset{tripoles/hemt/conn height/.initial=0}
+\ctikzset{tripoles/hemt/height/.initial=1.1}
+\ctikzset{tripoles/hemt/base width/.initial=.5}
+\ctikzset{tripoles/hemt/gate width/.initial=.62}
+\ctikzset{tripoles/hemt/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/hemt/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/hemt/bodydiode conn/.initial=.6}
+\ctikzset{tripoles/hemt/curr direction/.initial=1}
+
 \ctikzset{tripoles/nfet/width/.initial=.7}
 \ctikzset{tripoles/nfet/gate height/.initial=.35}
 \ctikzset{tripoles/nfet/base height/.initial=.5}
@@ -470,6 +616,7 @@
 \ctikzset{tripoles/npn/conn height/.initial=0}
 \ctikzset{tripoles/npn/height/.initial=1.1}
 \ctikzset{tripoles/npn/base width/.initial=.5}
+\ctikzset{tripoles/npn/arrow pos/.initial=.5}
 \ctikzset{tripoles/npn/bodydiode scale/.initial=.3}
 \ctikzset{tripoles/npn/bodydiode distance/.initial=.3}
 \ctikzset{tripoles/npn/bodydiode conn/.initial=.6}
@@ -482,6 +629,7 @@
 \ctikzset{tripoles/pnp/conn height/.initial=0}
 \ctikzset{tripoles/pnp/height/.initial=1.1}
 \ctikzset{tripoles/pnp/base width/.initial=.5}
+\ctikzset{tripoles/pnp/arrow pos/.initial=.5}
 \ctikzset{tripoles/pnp/bodydiode scale/.initial=.3}
 \ctikzset{tripoles/pnp/bodydiode distance/.initial=.3}
 \ctikzset{tripoles/pnp/bodydiode conn/.initial=.6}
@@ -579,8 +727,58 @@
 
 \newif\ifpgf@circuit@europeanlogicport
 \ctikzset{logic ports/.is choice}
-\ctikzset{logic ports/european/.code= {\pgf@circuit@europeanlogicporttrue } }
-\ctikzset{logic ports/american/.code= {\pgf@circuit@europeanlogicportfalse } } 
+\ctikzset{logic ports/european/.code= {\pgf@circuit@europeanlogicporttrue
+    \tikzset{and port/.style={shape=european and port}}
+    \tikzset{or port/.style={shape=european or port}}
+    \tikzset{xor port/.style={shape=european xor port}}
+    \tikzset{not port/.style={shape=european not port}}
+    \tikzset{nand port/.style={shape=european nand port}}
+    \tikzset{nor port/.style={shape=european nor port}}
+    \tikzset{xnor port/.style={shape=european xnor port}}
+    } }
+\ctikzset{logic ports/american/.code= {\pgf@circuit@europeanlogicportfalse
+    \tikzset{and port/.style={shape=american and port}}
+    \tikzset{or port/.style={shape=american or port}}
+    \tikzset{xor port/.style={shape=american xor port}}
+    \tikzset{not port/.style={shape=american not port}}
+    \tikzset{nand port/.style={shape=american nand port}}
+    \tikzset{nor port/.style={shape=american nor port}}
+    \tikzset{xnor port/.style={shape=american xnor port}}
+    } }
+
+\ctikzset{logic ports origin/.is choice}
+\ctikzset{logic ports origin/legacy/.code= {
+    \ctikzset{tripoles/american and port/origin/.initial=0.8}
+    \ctikzset{tripoles/american nand port/origin/.initial=0.8}
+    \ctikzset{tripoles/american nor port/origin/.initial=0.8}
+    \ctikzset{tripoles/american or port/origin/.initial=0.8}
+    \ctikzset{tripoles/american xor port/origin/.initial=0.8}
+    \ctikzset{tripoles/american xnor port/origin/.initial=0.8}
+    \ctikzset{tripoles/european and port/origin/.initial=0.8}
+    \ctikzset{tripoles/european nand port/origin/.initial=0.8}
+    \ctikzset{tripoles/european or port/origin/.initial=0.8}
+    \ctikzset{tripoles/european nor port/origin/.initial=0.8}
+    \ctikzset{tripoles/european xor port/origin/.initial=0.8}
+    \ctikzset{tripoles/european xnor port/origin/.initial=0.8}
+    \ctikzset{tripoles/european not port/origin/.initial=0.8}
+    }
+}
+\ctikzset{logic ports origin/center/.code= {
+    \ctikzset{tripoles/american and port/origin/.initial=0}
+    \ctikzset{tripoles/american nand port/origin/.initial=0}
+    \ctikzset{tripoles/american nor port/origin/.initial=0}
+    \ctikzset{tripoles/american or port/origin/.initial=0}
+    \ctikzset{tripoles/american xor port/origin/.initial=0}
+    \ctikzset{tripoles/american xnor port/origin/.initial=0}
+    \ctikzset{tripoles/european and port/origin/.initial=0}
+    \ctikzset{tripoles/european nand port/origin/.initial=0}
+    \ctikzset{tripoles/european or port/origin/.initial=0}
+    \ctikzset{tripoles/european nor port/origin/.initial=0}
+    \ctikzset{tripoles/european xor port/origin/.initial=0}
+    \ctikzset{tripoles/european xnor port/origin/.initial=0}
+    \ctikzset{tripoles/european not port/origin/.initial=0}
+    }
+}
 
 
 \ctikzset{tripoles/american and port/width/.initial=1.1}
@@ -598,8 +796,8 @@
 \ctikzset{tripoles/american or port/input height/.initial=.5}
 \ctikzset{tripoles/american or port/input skip/.initial=.25}
 \ctikzset{tripoles/american or port/aaa/.initial=.6}
-\ctikzset{tripoles/american or port/bbb/.initial=.4} 
-\ctikzset{tripoles/american or port/ccc/.initial=.5} 
+\ctikzset{tripoles/american or port/bbb/.initial=.4}
+\ctikzset{tripoles/american or port/ccc/.initial=.5}
 \ctikzset{tripoles/american or port/ddd/.initial=.0}
 \ctikzset{tripoles/american nor port/width/.initial=1.1}
 \ctikzset{tripoles/american nor port/height/.initial=.8}
@@ -608,30 +806,44 @@
 \ctikzset{tripoles/american nor port/input skip/.initial=.25}
 \ctikzset{tripoles/american nor port/circle width/.initial=.15}
 \ctikzset{tripoles/american nor port/aaa/.initial=.6}
-\ctikzset{tripoles/american nor port/bbb/.initial=.4} 
-\ctikzset{tripoles/american nor port/ccc/.initial=.5} 
+\ctikzset{tripoles/american nor port/bbb/.initial=.4}
+\ctikzset{tripoles/american nor port/ccc/.initial=.5}
 \ctikzset{tripoles/american nor port/ddd/.initial=.0}
 \ctikzset{tripoles/american xor port/width/.initial=1.1}
 \ctikzset{tripoles/american xor port/height/.initial=.8}
 \ctikzset{tripoles/american xor port/port width/.initial=.7}
 \ctikzset{tripoles/american xor port/input height/.initial=.5}
 \ctikzset{tripoles/american xor port/input skip/.initial=.15}
-\ctikzset{tripoles/american xor port/distance/.initial=.1} 
-\ctikzset{tripoles/american xor port/aaa/.initial=.6}
-\ctikzset{tripoles/american xor port/bbb/.initial=.4} 
-\ctikzset{tripoles/american xor port/ccc/.initial=.5} 
-\ctikzset{tripoles/american xor port/ddd/.initial=.0}
+\ctikzset{tripoles/american xor port/distance/.initial=.1}
 \ctikzset{tripoles/american xnor port/width/.initial=1.1}
 \ctikzset{tripoles/american xnor port/height/.initial=.8}
 \ctikzset{tripoles/american xnor port/port width/.initial=.7}
 \ctikzset{tripoles/american xnor port/input height/.initial=.5}
 \ctikzset{tripoles/american xnor port/input skip/.initial=.15}
-\ctikzset{tripoles/american xnor port/distance/.initial=.1} 
-\ctikzset{tripoles/american xnor port/aaa/.initial=.6}
-\ctikzset{tripoles/american xnor port/bbb/.initial=.4} 
-\ctikzset{tripoles/american xnor port/ccc/.initial=.5} 
-\ctikzset{tripoles/american xnor port/ddd/.initial=.0}
+\ctikzset{tripoles/american xnor port/distance/.initial=.1}
 \ctikzset{tripoles/american xnor port/circle width/.initial=.15}
+\ctikzset{tripoles/american and port/origin/.initial=0.8}
+\ctikzset{tripoles/american and port/inputs/.initial=2}
+% variable number of inputs
+\ctikzset{tripoles/american nand port/origin/.initial=0.8}
+\ctikzset{tripoles/american nand port/inputs/.initial=2}
+\ctikzset{tripoles/american nor port/origin/.initial=0.8}
+\ctikzset{tripoles/american nor port/inputs/.initial=2}
+\ctikzset{tripoles/american nor port/angle/.initial=70}
+\ctikzset{tripoles/american nor port/inner/.initial=0.3}
+\ctikzset{tripoles/american or port/origin/.initial=0.8}
+\ctikzset{tripoles/american or port/inputs/.initial=2}
+\ctikzset{tripoles/american or port/angle/.initial=70}
+\ctikzset{tripoles/american or port/inner/.initial=0.3}
+\ctikzset{tripoles/american xor port/origin/.initial=0.8}
+\ctikzset{tripoles/american xor port/inputs/.initial=2}
+\ctikzset{tripoles/american xor port/angle/.initial=70}
+\ctikzset{tripoles/american xor port/inner/.initial=0.3}
+\ctikzset{tripoles/american xnor port/origin/.initial=0.8}
+\ctikzset{tripoles/american xnor port/inputs/.initial=2}
+\ctikzset{tripoles/american xnor port/angle/.initial=70}
+\ctikzset{tripoles/american xnor port/inner/.initial=0.3}
+
 \ctikzset{tripoles/european and port/width/.initial=1.4}
 \ctikzset{tripoles/european and port/height/.initial=.65}
 \ctikzset{tripoles/european and port/reserved/.initial=.6}
@@ -668,24 +880,102 @@
 \ctikzset{tripoles/european nor port/height/.initial=.65}
 \ctikzset{tripoles/european nor port/reserved/.initial=.6}
 \ctikzset{tripoles/european nor port/input height/.initial=.6}
+% variable number of inputs
+\ctikzset{tripoles/european and port/origin/.initial=0.8}
+\ctikzset{tripoles/european and port/inputs/.initial=2}
+\ctikzset{tripoles/european nand port/origin/.initial=0.8}
+\ctikzset{tripoles/european nand port/inputs/.initial=2}
+\ctikzset{tripoles/european or port/origin/.initial=0.8}
+\ctikzset{tripoles/european or port/inputs/.initial=2}
+\ctikzset{tripoles/european nor port/origin/.initial=0.8}
+\ctikzset{tripoles/european nor port/inputs/.initial=2}
+\ctikzset{tripoles/european xor port/origin/.initial=0.8}
+\ctikzset{tripoles/european xor port/inputs/.initial=2}
+\ctikzset{tripoles/european xnor port/origin/.initial=0.8}
+\ctikzset{tripoles/european xnor port/inputs/.initial=2}
+\ctikzset{tripoles/european not port/origin/.initial=0.8}
+\ctikzset{tripoles/european not port/inputs/.initial=1}%
+%%% parameters that are not used anymore after multi-input
+%%% gates --- left for compatibility of source code.
+\ctikzset{tripoles/american xor port/aaa/.initial=.6}
+\ctikzset{tripoles/american xor port/bbb/.initial=.4}
+\ctikzset{tripoles/american xor port/ccc/.initial=.5}
+\ctikzset{tripoles/american xor port/ddd/.initial=.0}
+\ctikzset{tripoles/american xnor port/aaa/.initial=.6}
+\ctikzset{tripoles/american xnor port/bbb/.initial=.4}
+\ctikzset{tripoles/american xnor port/ccc/.initial=.5}
+\ctikzset{tripoles/american xnor port/ddd/.initial=.0}
+% switches for logic gates
+%
+\pgfkeys{/tikz/number inputs/.initial=0}
+\pgfkeys{/tikz/number inputs/.default=0}
+%
+% switches for op amps
+% changing input polarity
+%
+\newif\ifpgf@circuit@oa@iplusup\pgf@circuit@oa@iplusupfalse
+\pgfkeys{/tikz/noinv input up/.add code={}{\pgf@circuit@oa@iplusuptrue}}
+\ctikzset{noinv input up/.add code={}{\pgf@circuit@oa@iplusuptrue}}
+\pgfkeys{/tikz/input noinv down/.add code={}{\pgf@circuit@oa@iplusupfalse}}
+\ctikzset{input noinv down/.add code={}{\pgf@circuit@oa@iplusupfalse}}
+%
+% changing output polarity (for fully diff objects)
+%
+\newif\ifpgf@circuit@oa@oplusup\pgf@circuit@oa@oplusuptrue
+\pgfkeys{/tikz/noinv output up/.add code={}{\pgf@circuit@oa@oplusuptrue}}
+\ctikzset{noinv output up/.add code={}{\pgf@circuit@oa@oplusuptrue}}
+\pgfkeys{/tikz/noinv output down/.add code={}{\pgf@circuit@oa@oplusupfalse}}
+\ctikzset{noinv output down/.add code={}{\pgf@circuit@oa@oplusupfalse}}
+%
 \ctikzset{tripoles/op amp/width/.initial=1.7}
 \ctikzset{tripoles/op amp/port width/.initial=.7}
 \ctikzset{tripoles/op amp/height/.initial=1.4}
 \ctikzset{tripoles/op amp/input height/.initial=.5}
 \ctikzset{tripoles/op amp/up pos/.initial=.45}
-\ctikzset{tripoles/op amp/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolut font size needed!
+\ctikzset{tripoles/op amp/font/.initial= \fontsize{10}{12}\selectfont\boldmath}%absolute font size needed!
 \ctikzset{tripoles/en amp/width/.initial=1.7}
 \ctikzset{tripoles/en amp/port width/.initial=.7}
 \ctikzset{tripoles/en amp/height/.initial=1.6}
 \ctikzset{tripoles/en amp/input height/.initial=.3}
 \ctikzset{tripoles/en amp/up pos/.initial=.45}
-\ctikzset{tripoles/en amp/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolut font size needed!
-\ctikzset{tripoles/en amp/font2/.initial= \fontsize{14}{0}\selectfont\boldmath}%absolut font size needed!
+\ctikzset{tripoles/en amp/font/.initial= \fontsize{10}{12}\selectfont}%absolute font size needed!
+\ctikzset{tripoles/en amp/font2/.initial= \fontsize{12}{14}\selectfont}%absolute font size needed!
+\ctikzset{tripoles/en amp/text/.initial={$\mathstrut{\triangleright}\,{\infty}$}}
+\tikzset{
+    en amp text/.code = {
+        \ctikzsetvalof{tripoles/en amp/text}{#1}
+    },
+    en amp text A/.code = {
+        \ctikzsetvalof{tripoles/en amp/text}{$\mathstrut{\triangleright}\,\mathrm{A}$}
+    },
+}
 \ctikzset{tripoles/gm amp/width/.initial=1.7}
 \ctikzset{tripoles/gm amp/port width/.initial=.7}
 \ctikzset{tripoles/gm amp/height/.initial=1.4}
 \ctikzset{tripoles/gm amp/input height/.initial=.5}
 \ctikzset{tripoles/gm amp/up pos/.initial=.45}
+\ctikzset{tripoles/inst amp/width/.initial=1.7} % instrumentation amplifier, simple
+\ctikzset{tripoles/inst amp/port width/.initial=.7}
+\ctikzset{tripoles/inst amp/height/.initial=1.4}
+\ctikzset{tripoles/inst amp/input height/.initial=.5}
+\ctikzset{tripoles/inst amp/up pos/.initial=.4}
+\ctikzset{tripoles/inst amp/refv pos/.initial=.7}
+\ctikzset{tripoles/inst amp/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolute font size needed!
+\ctikzset{tripoles/fd inst amp/width/.initial=1.7} % instrumentation amplifier, diff output
+\ctikzset{tripoles/fd inst amp/port width/.initial=.7}
+\ctikzset{tripoles/fd inst amp/height/.initial=1.4}
+\ctikzset{tripoles/fd inst amp/input height/.initial=.5}
+\ctikzset{tripoles/fd inst amp/up pos/.initial=.4}
+\ctikzset{tripoles/fd inst amp/refv pos/.initial=.7}
+\ctikzset{tripoles/fd inst amp/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolute font size needed!
+\ctikzset{tripoles/inst amp ra/width/.initial=2.4} % instrumentation amplifier with ra gain resistance added
+\ctikzset{tripoles/inst amp ra/port width/.initial=.7}
+\ctikzset{tripoles/inst amp ra/height/.initial=2.9}
+\ctikzset{tripoles/inst amp ra/input height/.initial=.7}
+\ctikzset{tripoles/inst amp ra/up pos/.initial=.4}
+\ctikzset{tripoles/inst amp ra/refv pos/.initial=.7}
+\ctikzset{tripoles/inst amp ra/ra pos/.initial=.6}
+\ctikzset{tripoles/inst amp ra/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolute font size needed!
 \ctikzset{tripoles/plain amp/width/.initial=1.7}
 \ctikzset{tripoles/plain amp/port width/.initial=.7}
 \ctikzset{tripoles/plain amp/height/.initial=1.4}
@@ -704,6 +994,12 @@
 \ctikzset{tripoles/triac/diode width left/.initial=.3}
 \ctikzset{tripoles/triac/diode width right/.initial=.3}
 
+%% Cute switches
+\ctikzset{bipoles/cuteswitch/height/.initial=.6}
+\ctikzset{bipoles/cuteswitch/height 2/.initial=.2}
+\ctikzset{bipoles/cuteswitch/width/.initial=.50}
+\ctikzset{bipoles/cuteswitch/thickness/.initial=1}
+
 \ctikzset{tripoles/spdt/width/.initial=.85}
 \ctikzset{tripoles/spdt/height/.initial=.45}
 \ctikzset{tripoles/spdt/margin/.initial=.45}
@@ -740,6 +1036,45 @@
 
 \ctikzset{/tikz/circuitikz/tripoles/magnetron/width/.initial=1}
 
+%
+% multipoles
+%
+\ctikzset{multipoles/thickness/.initial=2}
+\ctikzset{multipoles/font/.initial=\tiny}
+% DIP (dual in line package) chips
+\ctikzset{multipoles/dipchip/width/.initial=1.2}
+\ctikzset{multipoles/dipchip/num pins/.initial=8}
+\ctikzset{multipoles/dipchip/pin spacing/.initial=0.4}
+\pgfkeys{/tikz/num pins/.add code={}{\ctikzset{multipoles/dipchip/num pins=#1}}}
+% QFP (quad flat package) chips
+\ctikzset{multipoles/qfpchip/num pins/.initial=8}
+\ctikzset{multipoles/qfpchip/pin spacing/.initial=0.4}
+\pgfkeys{/tikz/num pins/.add code={}{\ctikzset{multipoles/qfpchip/num pins=#1}}}
+% chip numbers
+\newif\ifpgf@circuit@chip@shownumbers\pgf@circuit@chip@shownumberstrue
+\pgfkeys{/tikz/show numbers/.add code={}{\pgf@circuit@chip@shownumberstrue}}
+\ctikzset{show numbers/.add code={}{\pgf@circuit@chip@shownumberstrue}}
+\pgfkeys{/tikz/hide numbers/.add code={}{\pgf@circuit@chip@shownumbersfalse}}
+\ctikzset{hide numbers/.add code={}{\pgf@circuit@chip@shownumbersfalse}}
+\newif\ifpgf@circuit@chip@straightnumbers\pgf@circuit@chip@straightnumberstrue
+\pgfkeys{/tikz/straight numbers/.add code={}{\pgf@circuit@chip@straightnumberstrue}}
+\ctikzset{straight numbers/.add code={}{\pgf@circuit@chip@straightnumberstrue}}
+\pgfkeys{/tikz/rotated numbers/.add code={}{\pgf@circuit@chip@straightnumbersfalse}}
+\ctikzset{rotated numbers/.add code={}{\pgf@circuit@chip@straightnumbersfalse}}
+% external chip pins
+\ctikzset{multipoles/external pins thickness/.initial=1}
+\ctikzset{multipoles/external pins width/.initial=0.2}
+\ctikzset{multipoles/external pad fraction/.initial=0}
+\pgfkeys{/tikz/external pins width/.add code={}{\ctikzset{multipoles/external pins width=#1}}}
+\pgfkeys{/tikz/external pad fraction/.add code={}{\ctikzset{multipoles/external pad fraction=#1}}}
+% topmarks
+\newif\ifpgf@circuit@chip@topmark\pgf@circuit@chip@topmarktrue
+\pgfkeys{/tikz/topmark/.add code={}{\pgf@circuit@chip@topmarktrue}}
+\ctikzset{topmark/.add code={}{\pgf@circuit@chip@topmarktrue}}
+\pgfkeys{/tikz/no topmark/.add code={}{\pgf@circuit@chip@topmarkfalse}}
+\ctikzset{no topmark/.add code={}{\pgf@circuit@chip@topmarkfalse}}
+
+
 
 % %Mechanical section
 \ctikzset{/tikz/circuitikz/tripoles/elmech/height/.initial=.8}
@@ -837,9 +1172,6 @@
 \ctikzset{bipole/nodes/right/diamond/.code={\ctikzsetvalof{bipole/nodes/right}{diamond}}}
 \ctikzset{bipole/nodes/right/rectjoinfill/.code={\ctikzsetvalof{bipole/nodes/right}{rectjoinfill}}}
 
-
-
-
 \newif\ifpgf@circuit@europeanresistor
 \ctikzset{resistor/.is choice}
 \ctikzset{resistor/american/.code = \pgf@circuit@europeanresistorfalse }
@@ -868,7 +1200,6 @@
 \ctikzset{color/.initial=black}
 \pgfkeys{/tikz/color/.add code={}{\ctikzset{color={#1}}}}
 
-
 \newif\ifpgf@circ@siunitx
 \newif\ifpgf@circ@siunitx@res
 
@@ -886,8 +1217,16 @@
 \ctikzset{voltage/distance from line/.initial=.08} % pos, tra 0 e 1
 \ctikzset{voltage/bump a/.initial=1.2}
 \ctikzset{voltage/bump b/.initial=1.5}
+\ctikzset{voltage/shift/.initial=0.0} % shift form the cable of voltage symbols
+\ctikzset{voltage shift/.style={voltage/shift=#1}}
+\tikzset{voltage shift/.style={\circuitikzbasekey/voltage/shift=#1}}
 \ctikzset{voltage/european label distance/.initial=1.4}
 \ctikzset{voltage/american label distance/.initial=1.1}
+% shaping the +/- sign, see pgfcircvoltage.tex
+\ctikzset{voltage/american font/.initial={}}
+\ctikzset{voltage/american plus/.initial={$+$}}
+\ctikzset{voltage/american minus/.initial={$-$}}
+
 % special cases
 \ctikzset{bipoles/generic/voltage/distance from node/.initial=.4}
 \ctikzset{bipoles/generic/voltage/bump b/.initial=2}
@@ -948,7 +1287,7 @@
 \tikzset{american/.style = { american currents, american voltages, american resistors, american inductors, american ports, american gas filled surge arrester set} }
 \tikzset{cute/.style = { european currents, european voltages, american resistors, cute inductors, american ports } }
 
-% I should try to make the tree clearer (this voltaege conflicts with the options above)
+% I should try to make the tree clearer (this voltage conflicts with the options above)
 
 \newif\ifpgf@circuit@europeanvoltage
 \ctikzset{voltage/.is choice}
@@ -960,6 +1299,9 @@
 \ctikzset{current/american/.code = \pgf@circuit@europeancurrentfalse }
 \ctikzset{current/european/.code = \pgf@circuit@europeancurrenttrue }
 
+% noise sources
+\ctikzset{bipoles/noise sources/fillcolor/.initial=gray!50}
+
 \ctikzset{label/align/.is choice}
 \ctikzset{label/align/straight/.code={\ctikzsetvalof{label/align}{straight}}}
 \ctikzset{label/align/rotate/.code={\ctikzsetvalof{label/align}{rotate}}}
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
index 2850c146763..b69e9c47708 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
@@ -5,7 +5,7 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %% Generic macro for defining a bipole shape
 % #1 - additional anchors
@@ -17,900 +17,1475 @@
 
 
 \long\def\pgfcircdeclarebipole#1#2#3#4#5#6{
-	\pgfdeclareshape{#3shape}{
-	
-	\savedanchor{\northeast}{
-		\pgf@y=#4\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=#5\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	}
-	\savedanchor{\northeastborder}{
-		\pgf@y=#4\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\ctikzvalof{bipoles/border margin}\pgf@y
-		\pgf@x=#5\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-		\pgf@x=\ctikzvalof{bipoles/border margin}\pgf@x
-	}
-	\savedanchor{\southwestborder}{
-		\pgf@y=-#2\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\ctikzvalof{bipoles/border margin}\pgf@y
-		\pgf@x=-#5\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-		\pgf@x=\ctikzvalof{bipoles/border margin}\pgf@x
-	}
-	\savedanchor{\southwest}{
-		\pgf@y=-#2\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-#5\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	}
-	\savedanchor{\centerpoint}{
-		\pgf@circ@res@down=-#2\pgf@circ@Rlen
-		\pgf@circ@res@up=#4\pgf@circ@Rlen
-		\pgfpointorigin
-		\pgf@y=\pgf@circ@res@up
-		\advance\pgf@y by\pgf@circ@res@down
-		\pgf@y=.5\pgf@y
-	}
-	\anchor{center}{\pgfpointorigin}
-	\anchor{n}{
-		\northeast
-		\pgf@x=0cm
-	}
-	\anchor{ne}{
-		\northeast
-	}
-	\anchor{nw}{
-		\northeast
-		\pgf@x=-\pgf@x
-	}
-	\anchor{e}{%
-		\northeast
-		\pgf@y=0cm
-   }
-	\anchor{s}{%
-		\southwest
-		\pgf@x=0cm
-   }
-	\anchor{se}{%
-		\southwest
-		\pgf@x=-\pgf@x
-   }
-	\anchor{sw}{%
-		\southwest
-   }
-	\anchor{w}{
-		\southwest
-		\pgf@y=0cm
-	}
-	\anchor{north}{
-		\northeast
-		\pgf@x=0cm
-	}
-	\anchor{east}{%
-		\northeast
-		\pgf@y=0cm
-   }
-	\anchor{south}{%
-		\southwest
-		\pgf@x=0cm
-   }
-	\anchor{west}{
-		\southwest
-		\pgf@y=0cm
-	}
-	\anchor{right}{
-		\northeast
-		\pgf@y=0cm
-	}
-	\anchor{above}{
-		\northeast
-		\pgf@x=0cm
-	}
-	\anchor{left}{%
-		\southwest
-		\pgf@y=0cm
-   }
-	\anchor{below}{%
-		\southwest
-		\pgf@x=0cm                    
-   }
-	\anchor{a}{%
-		\northeast
-		\pgf@y=0cm
-   }
-	\anchor{b} {
-		\southwest
-		\pgf@y=0cm
-	}
-	\savedanchor{\textanchor}{%
-		\pgf@y=\ht\pgfnodeparttextbox
-		\pgf@x=-.5\wd\pgfnodeparttextbox
-   }
-	\anchor{text}{%
-		\textanchor
-   }
-	\anchorborder{%
-		\ifpgf@circuit@bipole@inverted
-			\pgf@circ@res@left=-\pgf@x
-			\pgf@circ@res@right=-\pgf@y
-		\else
-			\pgf@circ@res@left=\pgf@x
-			\pgf@circ@res@right=\pgf@y
-		\fi
-		\ifdim\pgf@circ@res@right>0cm
-			\pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@right}}{\northeastborder}
-		\else
-	  		\southwestborder	
-	  	\pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@right}}{\pgfpoint{-\pgf@x}{-\pgf@y}}
-		\fi
-	}
-	
-	#1
-	
-	\backgroundpath{	
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-		
-		\northeast
-		\pgf@circ@res@up = \pgf@y 
-		\pgf@circ@res@zero = 0cm
-		\pgf@circ@res@left = -\pgf@x
-		\pgf@circ@res@right = \pgf@x
-		\southwest
-		\pgf@circ@res@down = \pgf@y
-
- 		\pgfstartlinewidth=\pgflinewidth
-		\pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
-		#6
-			
-		\pgfsetlinewidth{\pgfstartlinewidth}
-	}
-	}
+    \pgfdeclareshape{#3shape}{
+
+        \savedanchor{\northeast}{
+            \pgf@y=#4\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=#5\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        }
+        \savedanchor{\northeastborder}{
+            \pgf@y=#4\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@y=\ctikzvalof{bipoles/border margin}\pgf@y
+            \pgf@x=#5\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+            \pgf@x=\ctikzvalof{bipoles/border margin}\pgf@x
+        }
+        \savedanchor{\southwestborder}{
+            \pgf@y=-#2\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@y=\ctikzvalof{bipoles/border margin}\pgf@y
+            \pgf@x=-#5\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+            \pgf@x=\ctikzvalof{bipoles/border margin}\pgf@x
+        }
+        \savedanchor{\southwest}{
+            \pgf@y=-#2\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-#5\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        }
+        \savedanchor{\centerpoint}{
+            \pgf@circ@res@down=-#2\pgf@circ@Rlen
+            \pgf@circ@res@up=#4\pgf@circ@Rlen
+            \pgfpointorigin
+            \pgf@y=\pgf@circ@res@up
+            \advance\pgf@y by\pgf@circ@res@down
+            \pgf@y=.5\pgf@y
+        }
+        \anchor{center}{\pgfpointorigin}
+        \anchor{n}{
+            \northeast
+            \pgf@x=0cm
+        }
+        \anchor{north east}{
+            \northeast
+        }
+        \anchor{north west}{
+            \northeast
+            \pgf@x=-\pgf@x
+        }
+        \anchor{ne}{
+            \northeast
+        }
+        \anchor{nw}{
+            \northeast
+            \pgf@x=-\pgf@x
+        }
+        \anchor{e}{
+            \northeast
+            \pgf@y=0cm
+        }
+        \anchor{s}{
+            \southwest
+            \pgf@x=0cm
+        }
+        \anchor{south east}{
+            \southwest
+            \pgf@x=-\pgf@x
+        }
+        \anchor{south west}{
+            \southwest
+        }
+        \anchor{se}{
+            \southwest
+            \pgf@x=-\pgf@x
+        }
+        \anchor{sw}{
+            \southwest
+        }
+        \anchor{w}{
+            \southwest
+            \pgf@y=0cm
+        }
+        \anchor{north}{
+            \northeast
+            \pgf@x=0cm
+        }
+        \anchor{east}{
+            \northeast
+            \pgf@y=0cm
+        }
+        \anchor{south}{
+            \southwest
+            \pgf@x=0cm
+        }
+        \anchor{west}{
+            \southwest
+            \pgf@y=0cm
+        }
+        \anchor{right}{
+            \northeast
+            \pgf@y=0cm
+        }
+        \anchor{above}{
+            \northeast
+            \pgf@x=0cm
+        }
+        \anchor{left}{
+            \southwest
+            \pgf@y=0cm
+        }
+        \anchor{below}{
+            \southwest
+            \pgf@x=0cm
+        }
+        \anchor{a}{
+            \northeast
+            \pgf@y=0cm
+        }
+        \anchor{b}{
+            \southwest
+            \pgf@y=0cm
+        }
+        \savedanchor{\textanchor}{%
+            \pgf@y=\ht\pgfnodeparttextbox
+            \pgf@x=-.5\wd\pgfnodeparttextbox
+        }
+        \anchor{text}{
+            \textanchor
+        }
+        \anchorborder{%
+            \ifpgf@circuit@bipole@inverted
+                \pgf@circ@res@left=-\pgf@x
+                \pgf@circ@res@right=-\pgf@y
+            \else
+                \pgf@circ@res@left=\pgf@x
+                \pgf@circ@res@right=\pgf@y
+            \fi
+            \ifdim\pgf@circ@res@right>0cm
+                \pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@right}}{\northeastborder}
+            \else
+                \southwestborder
+                \pgfpointborderrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@right}}{\pgfpoint{-\pgf@x}{-\pgf@y}}
+            \fi
+        }
+
+        #1
+
+        \backgroundpath{
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+            \northeast
+            \pgf@circ@res@up = \pgf@y
+            \pgf@circ@res@zero = 0cm
+            \pgf@circ@res@left = -\pgf@x
+            \pgf@circ@res@right = \pgf@x
+            \southwest
+            \pgf@circ@res@down = \pgf@y
+
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
+            #6
+
+            \pgfsetlinewidth{\pgfstartlinewidth}
+        }
+    }
 }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Standard bipole shapes declarations
 
 %% Resistor
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/resistor/height}}{resistor}{\ctikzvalof{bipoles/resistor/height}}{\ctikzvalof{bipoles/resistor/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments
-	\pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
-	\divide \pgf@circ@res@step by 12
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
-	\pgf@circ@res@other = \pgf@circ@res@left
-	\advance\pgf@circ@res@other by \pgf@circ@res@step 
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step 
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by \pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
-	\pgfsetbeveljoin
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/resistor/height}}
+{resistor}
+{\ctikzvalof{bipoles/resistor/height}}
+{\ctikzvalof{bipoles/resistor/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+    \divide \pgf@circ@res@step by 12
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfsetbeveljoin
+    \pgfusepath{draw}
 }
 
 
 
 %% Variable resistor
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vresistor/height}}{vresistor}{\ctikzvalof{bipoles/vresistor/height}}{\ctikzvalof{bipoles/vresistor/width}}{		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments
-	\pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
-	\divide \pgf@circ@res@step by 12
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
-	
-	\pgf@circ@res@other = \pgf@circ@res@left
-	\advance\pgf@circ@res@other by \pgf@circ@res@step 
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step 
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
-	\advance\pgf@circ@res@other by \pgf@circ@res@step
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
-	\pgfsetbeveljoin
-	\pgfusepath{draw}
-	
-	\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vresistor/height}}
+{vresistor}
+{\ctikzvalof{bipoles/vresistor/height}}
+{\ctikzvalof{bipoles/vresistor/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+    \divide \pgf@circ@res@step by 12
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfsetbeveljoin
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 
 %% Capacitor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/capacitor/height}}{capacitor}{\ctikzvalof{bipoles/capacitor/height}}{\ctikzvalof{bipoles/capacitor/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/capacitor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 5
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/capacitor/height}}
+{capacitor}
+{\ctikzvalof{bipoles/capacitor/height}}
+{\ctikzvalof{bipoles/capacitor/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/capacitor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 5
 
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
 }
 
+%% Capacitive sensor
+\pgfcircdeclarebipole
+{\anchor{label}{%
+        \southwest
+        \pgf@x=2.6\pgf@x
+        \pgf@y=1.4\pgf@y
+    }%
+}
+{\ctikzvalof{bipoles/capacitor/height}}
+{capacitivesens}
+{\ctikzvalof{bipoles/capacitor/height}}
+{\ctikzvalof{bipoles/capacitor/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/capacitor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 5
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{2.6\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-2.6\pgf@circ@res@right}{1.4\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-4.4\pgf@circ@res@right}{1.4\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
 
 %% Polar Capacitor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/pcapacitor/height}}{polarcapacitor}{\ctikzvalof{bipoles/pcapacitor/height}}{\ctikzvalof{bipoles/pcapacitor/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/pcapacitor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 5
-
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-				
-		\pgfscope
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left+ \ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}{\pgf@circ@res@up}}
-			\pgftransformrotate{-90}
-			\pgfpathsine{\pgfpoint{\pgf@circ@res@up}{-\ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}}
-			\pgfpathcosine{\pgfpoint{\pgf@circ@res@up}{\ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}}
-			\pgfusepath{draw}
-		\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/pcapacitor/height}}
+{polarcapacitor}
+{\ctikzvalof{bipoles/pcapacitor/height}}
+{\ctikzvalof{bipoles/pcapacitor/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/pcapacitor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 5
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left+ \ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgftransformrotate{-90}
+        \pgfpathsine{\pgfpoint{\pgf@circ@res@up}{-\ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}}
+        \pgfpathcosine{\pgfpoint{\pgf@circ@res@up}{\ctikzvalof{bipoles/pcapacitor/bend width}\pgf@circ@res@left}}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
 }
 
 %% Electrolytic Capacitor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/ecapacitor/height}}{ecapacitor}{\ctikzvalof{bipoles/ecapacitor/height}}{\ctikzvalof{bipoles/ecapacitor/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/ecapacitor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 5
-		\pgfsetrectcap
-		% % % Draw plus pole
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfsetfillcolor{white} 
-		\pgfusepath{draw,fill}
-		% % Draw minus pole
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-				 \pgfsetfillcolor{black} 
-				\pgfusepath{draw,fill}
-		\pgfsetfillcolor{black} 
-		% % plus pole annotation
-		\pgftext[right,at=\pgfpoint{1.2\pgf@circ@res@left}{.6\pgf@circ@res@up}]
-		{\pgfkeysvalueof{/tikz/circuitikz/bipoles/ecapacitor/font} $+$}	
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/ecapacitor/height}}
+{ecapacitor}
+{\ctikzvalof{bipoles/ecapacitor/height}}
+{\ctikzvalof{bipoles/ecapacitor/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/ecapacitor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 5
+    \pgfsetrectcap
+    % % % Draw plus pole
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgf@circ@draworfill
+    % % Draw minus pole
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfsetfillcolor{black}
+    \pgfusepath{draw,fill}
+    \pgfsetfillcolor{black}
+    % % plus pole annotation
+    \pgftext[right,at=\pgfpoint{1.2\pgf@circ@res@left}{.6\pgf@circ@res@up}]
+    {\pgfkeysvalueof{/tikz/circuitikz/bipoles/ecapacitor/font} $+$}
 }
 
 %% Battery
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/battery/height}}{battery}{\ctikzvalof{bipoles/battery/height}}{\ctikzvalof{bipoles/battery/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/battery/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 6
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/battery/height}}
+{battery}
+{\ctikzvalof{bipoles/battery/height}}
+{\ctikzvalof{bipoles/battery/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/battery/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 6
 
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{.5\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{.5\pgf@circ@res@down}}
+    \ifpgf@circ@fixbatteries
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@down}}
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{.5\pgf@circ@res@down}}
 
-		\pgfusepath{draw}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \else
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{.5\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+    \fi
+    \pgfusepath{draw}
 }
 
 
 %% Battery 1 % poles with equl thickness
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/battery1/height}}{battery1}{\ctikzvalof{bipoles/battery1/height}}{\ctikzvalof{bipoles/battery1/width}}{
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/battery1/height}}
+{battery1}
+{\ctikzvalof{bipoles/battery1/height}}
+{\ctikzvalof{bipoles/battery1/width}}
+{
+    \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfusepath{draw}
 
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@down}}
-
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \ifpgf@circ@fixbatteries
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+    \else
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \fi
+    \pgfusepath{draw}
 }
 
 %% Battery 2 % negative pole thicker
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/battery2/height}}{battery2}{\ctikzvalof{bipoles/battery2/height}}{\ctikzvalof{bipoles/battery2/width}}{
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/battery2/height}}
+{battery2}
+{\ctikzvalof{bipoles/battery2/height}}
+{\ctikzvalof{bipoles/battery2/width}}
+{
+    \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfusepath{draw}
 
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfsetlinewidth{3\pgflinewidth}
-		\pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@down}}
-		\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \ifpgf@circ@fixbatteries
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+        \pgfsetlinewidth{3\pgflinewidth}
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+    \else
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+        \pgfsetlinewidth{3\pgflinewidth}
+        \pgfpathmoveto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.33\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+    \fi
+    \pgfusepath{draw}
 }
 
 
 %% cute inductor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cuteinductor/lower coil height}}{cuteinductor}{\ctikzvalof{bipoles/cuteinductor/height}}{\ctikzvalof{bipoles/cuteinductor/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cuteinductor/lower coil height}}
+{cuteinductor}
+{\ctikzvalof{bipoles/cuteinductor/height}}
+{\ctikzvalof{bipoles/cuteinductor/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
 
-	\pgfmathsetlength{\pgf@circ@res@other}%width of small coil
-	{0.5*\ctikzvalof{bipoles/cuteinductor/coil aspect}*\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/cuteinductor/coils}-1)}
+    \pgfmathsetlength{\pgf@circ@res@other}%width of small coil
+    {0.5*\ctikzvalof{bipoles/cuteinductor/coil aspect}*\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/cuteinductor/coils}-1)}
 
 
-	\pgfmathsetlength{\pgf@circ@res@step}
-		{(\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/cuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/cuteinductor/coils}/2}
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
-	\foreach \x in {2,...,\ctikzvalof{bipoles/cuteinductor/coils}}
-	{
-		\pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
-		\pgfpatharc{0}{-180}{\pgf@circ@res@other and -\pgf@circ@res@down}
-	}
-	\pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
-	\pgfsetbuttcap
-	\pgfsetbeveljoin
-	\pgfusepath{stroke}
+    \pgfmathsetlength{\pgf@circ@res@step}
+    {(\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/cuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/cuteinductor/coils}/2}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {2,...,\ctikzvalof{bipoles/cuteinductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+        \pgfpatharc{0}{-180}{\pgf@circ@res@other and -\pgf@circ@res@down}
+    }
+    \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
 }
 
-%% variable cute inductor
+%% cute inductive sensor
+
+\pgfcircdeclarebipole
+{%
+{% anchor for labelling the type of dependency
+    \anchor{label}{%
+        \southwest
+        \pgf@x=0.8\pgf@x
+        \pgf@y=2.6\pgf@y
+    }%
+}}
+{\ctikzvalof{bipoles/cuteinductor/lower coil height}}
+{scuteinductor}
+{\ctikzvalof{bipoles/cuteinductor/height}}
+{\ctikzvalof{bipoles/cuteinductor/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vcuteinductor/lower coil height}}{vcuteinductor}{\ctikzvalof{bipoles/vcuteinductor/height}}{\ctikzvalof{bipoles/vcuteinductor/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments	
-	
-	\pgfmathsetlength{\pgf@circ@res@other}%width of small coil
-	{0.5*\ctikzvalof{bipoles/vcuteinductor/coil aspect}*\ctikzvalof{bipoles/vcuteinductor/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/vcuteinductor/coils}-1)}
+    \pgfmathsetlength{\pgf@circ@res@other}%width of small coil
+    {0.5*\ctikzvalof{bipoles/cuteinductor/coil aspect}*\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/cuteinductor/coils}-1)}
 
 
-	\pgfmathsetlength{\pgf@circ@res@step}
-		{(\ctikzvalof{bipoles/vcuteinductor/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/vcuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/vcuteinductor/coils}/2}
-
-	\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
-	\foreach \x in {2,...,\ctikzvalof{bipoles/vcuteinductor/coils}}
-	{
-		\pgfpatharc{180}{0}{\pgf@circ@res@step and .5\pgf@circ@res@up}
-		\pgfpatharc{0}{-180}{\pgf@circ@res@other and -.5\pgf@circ@res@down}
-	}
-	\pgfpatharc{180}{0}{\pgf@circ@res@step and .5\pgf@circ@res@up}
-	\pgfsetbuttcap
-	\pgfsetbeveljoin
-	\pgfusepath{stroke}
+    \pgfmathsetlength{\pgf@circ@res@step}
+    {(\ctikzvalof{bipoles/cuteinductor/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/cuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/cuteinductor/coils}/2}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {2,...,\ctikzvalof{bipoles/cuteinductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+        \pgfpatharc{0}{-180}{\pgf@circ@res@other and -\pgf@circ@res@down}
+    }
+    \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{.8\pgf@circ@res@right}{2\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.8\pgf@circ@res@right}{2.6\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-1.6\pgf@circ@res@right}{2.6\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
+%% cute choke
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cutechoke/lower coil height}}
+{cutechoke}
+{\ctikzvalof{bipoles/cutechoke/height}}
+{\ctikzvalof{bipoles/cutechoke/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+
+    \pgfmathsetlength{\pgf@circ@res@other}%width of small coil
+    {0.5*\ctikzvalof{bipoles/cutechoke/coil aspect}*\ctikzvalof{bipoles/cutechoke/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/cutechoke/coils}-1)}
+
+
+    \pgfmathsetlength{\pgf@circ@res@step}
+    {(\ctikzvalof{bipoles/cutechoke/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/cutechoke/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/cutechoke/coils}/2}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {2,...,\ctikzvalof{bipoles/cutechoke/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+        \pgfpatharc{0}{-180}{\pgf@circ@res@other and -\pgf@circ@res@down}
+    }
+    \pgfpatharc{180}{0}{\pgf@circ@res@step and \pgf@circ@res@up}
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth+\ctikzvalof{bipoles/cutechoke/cdist}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth+\ctikzvalof{bipoles/cutechoke/cdist}\pgf@circ@res@up}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}*\ctikzvalof{bipoles/cutechoke/cthick}\pgfstartlinewidth}
+    \pgfusepath{stroke}
+
+    \ifpgf@circuit@bipole@twolines
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth+\ctikzvalof{bipoles/cutechoke/cdist}\pgf@circ@res@up+\ctikzvalof{bipoles/cutechoke/cstep}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth+\ctikzvalof{bipoles/cutechoke/cdist}\pgf@circ@res@up+\ctikzvalof{bipoles/cutechoke/cstep}\pgf@circ@res@up}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}*\ctikzvalof{bipoles/cutechoke/cthick}\pgfstartlinewidth}
+        \pgfusepath{stroke}
+    \fi
+}
+
+%% variable cute inductor
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vcuteinductor/lower coil height}}
+{vcuteinductor}
+{\ctikzvalof{bipoles/vcuteinductor/height}}
+{\ctikzvalof{bipoles/vcuteinductor/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+
+    \pgfmathsetlength{\pgf@circ@res@other}%width of small coil
+    {0.5*\ctikzvalof{bipoles/vcuteinductor/coil aspect}*\ctikzvalof{bipoles/vcuteinductor/width}*\pgf@circ@Rlen/(\ctikzvalof{bipoles/vcuteinductor/coils}-1)}
+
+
+    \pgfmathsetlength{\pgf@circ@res@step}
+    {(\ctikzvalof{bipoles/vcuteinductor/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment\pgflinewidth+(\ctikzvalof{bipoles/vcuteinductor/coils}-1)*2*\pgf@circ@res@other)/\ctikzvalof{bipoles/vcuteinductor/coils}/2}
+
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {2,...,\ctikzvalof{bipoles/vcuteinductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and .5\pgf@circ@res@up}
+        \pgfpatharc{0}{-180}{\pgf@circ@res@other and -.5\pgf@circ@res@down}
+    }
+    \pgfpatharc{180}{0}{\pgf@circ@res@step and .5\pgf@circ@res@up}
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
+}
 %% american inductor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/americaninductor/height 2}}{americaninductor}{\ctikzvalof{bipoles/americaninductor/height}}{\ctikzvalof{bipoles/americaninductor/width}}{
-	\pgf@circ@res@step=\ctikzvalof{bipoles/americaninductor/width}\pgf@circ@Rlen
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
-	\pgftransformationadjustments
-	\advance \pgf@circ@res@step by \pgfhorizontaltransformationadjustment\pgflinewidth
-	\divide \pgf@circ@res@step by \ctikzvalof{bipoles/americaninductor/coils}
-	\divide \pgf@circ@res@step by 2
-	\pgf@circ@res@other = \ctikzvalof{bipoles/americaninductor/coil height}\pgf@circ@Rlen
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
-	\foreach \x in {1,...,\ctikzvalof{bipoles/americaninductor/coils}}
-	{
-	\pgfpatharc{180}{0}{\pgf@circ@res@step and  \pgf@circ@res@other}
-	}
-	\pgfsetbuttcap
-	\pgfsetbeveljoin
-	\pgfusepath{stroke}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/americaninductor/height 2}}
+{americaninductor}
+{\ctikzvalof{bipoles/americaninductor/height}}
+{\ctikzvalof{bipoles/americaninductor/width}}
+{
+    \pgf@circ@res@step=\ctikzvalof{bipoles/americaninductor/width}\pgf@circ@Rlen
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \advance \pgf@circ@res@step by \pgfhorizontaltransformationadjustment\pgflinewidth
+    \divide \pgf@circ@res@step by \ctikzvalof{bipoles/americaninductor/coils}
+    \divide \pgf@circ@res@step by 2
+    \pgf@circ@res@other = \ctikzvalof{bipoles/americaninductor/coil height}\pgf@circ@Rlen
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {1,...,\ctikzvalof{bipoles/americaninductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and  \pgf@circ@res@other}
+    }
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
+}
+
+
+%% american inductive sensor
+
+\pgfcircdeclarebipole
+{%
+{% anchor for labelling the type of dependency
+    \anchor{label}{%
+        \southwest
+        \pgf@x=0.8\pgf@x
+        \pgf@y=2.6\pgf@y
+    }%
+}}
+{\ctikzvalof{bipoles/americaninductor/height 2}}
+{samericaninductor}
+{\ctikzvalof{bipoles/americaninductor/height}}
+{\ctikzvalof{bipoles/americaninductor/width}}
+{
+    \pgf@circ@res@step=\ctikzvalof{bipoles/americaninductor/width}\pgf@circ@Rlen
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \advance \pgf@circ@res@step by \pgfhorizontaltransformationadjustment\pgflinewidth
+    \divide \pgf@circ@res@step by \ctikzvalof{bipoles/americaninductor/coils}
+    \divide \pgf@circ@res@step by 2
+    \pgf@circ@res@other = \ctikzvalof{bipoles/americaninductor/coil height}\pgf@circ@Rlen
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {1,...,\ctikzvalof{bipoles/americaninductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and  \pgf@circ@res@other}
+    }
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{.8\pgf@circ@res@right}{2\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.8\pgf@circ@res@right}{2.6\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-1.6\pgf@circ@res@right}{2.6\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% variable american inductor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vamericaninductor/height 2}}{vamericaninductor}{\ctikzvalof{bipoles/vamericaninductor/height}}{\ctikzvalof{bipoles/vamericaninductor/width}}{
-	\pgf@circ@res@step=\ctikzvalof{bipoles/vamericaninductor/width}\pgf@circ@Rlen
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments
-	\advance \pgf@circ@res@step by \pgfhorizontaltransformationadjustment\pgflinewidth
-	\divide \pgf@circ@res@step by \ctikzvalof{bipoles/vamericaninductor/coils}
-	\divide \pgf@circ@res@step by 2
-	\pgf@circ@res@other = \ctikzvalof{bipoles/vamericaninductor/coil height}\pgf@circ@Rlen
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
-	\foreach \x in {1,...,\ctikzvalof{bipoles/vamericaninductor/coils}}
-	{
-	\pgfpatharc{180}{0}{\pgf@circ@res@step and  \pgf@circ@res@other}
-	}
-	\pgfsetbuttcap
-	\pgfsetbeveljoin
-	\pgfusepath{stroke}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vamericaninductor/height 2}}
+{vamericaninductor}
+{\ctikzvalof{bipoles/vamericaninductor/height}}
+{\ctikzvalof{bipoles/vamericaninductor/width}}
+{
+    \pgf@circ@res@step=\ctikzvalof{bipoles/vamericaninductor/width}\pgf@circ@Rlen
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \advance \pgf@circ@res@step by \pgfhorizontaltransformationadjustment\pgflinewidth
+    \divide \pgf@circ@res@step by \ctikzvalof{bipoles/vamericaninductor/coils}
+    \divide \pgf@circ@res@step by 2
+    \pgf@circ@res@other = \ctikzvalof{bipoles/vamericaninductor/coil height}\pgf@circ@Rlen
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{-\pgfverticaltransformationadjustment*0.4*\pgfstartlinewidth}}%correct value would be 0.5 but arcs are not really flat, therefore 0.4 is better is (almost) all cases
+    \foreach \x in {1,...,\ctikzvalof{bipoles/vamericaninductor/coils}}
+    {
+        \pgfpatharc{180}{0}{\pgf@circ@res@step and  \pgf@circ@res@other}
+    }
+    \pgfsetbuttcap
+    \pgfsetbeveljoin
+    \pgfusepath{stroke}
 
-	\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 %% Independent voltage source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsource/height}}{vsource}{\ctikzvalof{bipoles/vsource/height}}{\ctikzvalof{bipoles/vsource/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsource/height}}
+{vsource}
+{\ctikzvalof{bipoles/vsource/height}}
+{\ctikzvalof{bipoles/vsource/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
 }
 
 
 %% Independent voltage source - American style
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsourceam/height}}{vsourceAM}{\ctikzvalof{bipoles/vsourceam/height}}{\ctikzvalof{bipoles/vsourceam/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsourceam/height}}
+{vsourceAM}
+{\ctikzvalof{bipoles/vsourceam/height}}
+{\ctikzvalof{bipoles/vsourceam/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}
-	\ifpgf@circ@oldvoltagedirection
-		\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{$+$}
-		\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@up]{$-$}
-	\else
-		\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{$-$}
-		\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@up]{$+$}
-	\fi
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+    \ifpgf@circ@oldvoltagedirection
+        \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{$+$}
+        \pgftext[top,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@up]{$-$}
+    \else
+        \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@down]{$-$}
+        \pgftext[top,rotate=90,y=\ctikzvalof{bipoles/vsourceam/margin}\pgf@circ@res@up]{$+$}
+    \fi
 }
 
 
 
 %% Independent sinusoidal voltage source
- 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsourcesin/height}}{vsourcesin}{\ctikzvalof{bipoles/vsourcesin/height}}{\ctikzvalof{bipoles/vsourcesin/width}}{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}		
-		
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
-}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsourcesin/height}}
+{vsourcesin}
+{\ctikzvalof{bipoles/vsourcesin/height}}
+{\ctikzvalof{bipoles/vsourcesin/width}}
+{
 
-% Triangle Voltage source - contributed by Ralf Farkas
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsourcetri/height}}{vsourcetri}{\ctikzvalof{bipoles/vsourcetri/height}}{\ctikzvalof{bipoles/vsourcetri/width}}{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}		
-		
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
-			\pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@up}{0.75\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@up}{-0.75\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{0\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
-
 % Square Voltage source -  contributed by Alistair Kwan
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsourcesquare/height}}{vsourcesquare}{\ctikzvalof{bipoles/vsourcesquare/height}}{\ctikzvalof{bipoles/vsourcesquare/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}
-	\pgf@circ@res@up = .5\pgf@circ@res@up
-	\pgfscope
-		\pgftransformrotate{90}
-		\pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
-		\pgfpathlineto{\pgfpoint{-1\pgf@circ@res@up}{1\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0\pgf@circ@res@up}{1\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0\pgf@circ@res@up}{-1\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{-1\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{0\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsourcesquare/height}}
+{vsourcesquare}
+{\ctikzvalof{bipoles/vsourcesquare/height}}
+{\ctikzvalof{bipoles/vsourcesquare/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
+        \pgfpathlineto{\pgfpoint{-1\pgf@circ@res@up}{1\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0\pgf@circ@res@up}{1\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0\pgf@circ@res@up}{-1\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{-1\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{0\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 % Triangle Voltage source - contributed by Ralf Farkas
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vsourcetri/height}}{vsourcetri}{\ctikzvalof{bipoles/vsourcetri/height}}{\ctikzvalof{bipoles/vsourcetri/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}		
-		
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
-			\pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@up}{0.75\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@up}{-0.75\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{0\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
-}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsourcetri/height}}
+{vsourcetri}
+{\ctikzvalof{bipoles/vsourcetri/height}}
+{\ctikzvalof{bipoles/vsourcetri/width}}
+{
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
 
-%% Empty Source
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/esource/height}}{esource}{\ctikzvalof{bipoles/esource/height}}{\ctikzvalof{bipoles/esource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
+        \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@up}{0.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@up}{-0.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{1\pgf@circ@res@up}{0\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
+
 %% PV Source
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/pvsource/height}}{pvsource}{\ctikzvalof{bipoles/pvsource/height}}{\ctikzvalof{bipoles/pvsource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/pvsource/height}}
+{pvsource}
+{\ctikzvalof{bipoles/pvsource/height}}
+{\ctikzvalof{bipoles/pvsource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
+    \pgf@circ@draworfill
 
-	\pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@right}{0}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-	\pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@left}{0}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@right}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfusepath{draw}
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@left}{.4\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.15\pgf@circ@res@left}{.4\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@left}{.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.15\pgf@circ@res@left}{.4\pgf@circ@res@down}}
 
-	\pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@right}{.6\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.15\pgf@circ@res@right}{.6\pgf@circ@res@down}}
-	\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{.15\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.15\pgf@circ@res@right}{.6\pgf@circ@res@down}}
+    \pgfusepath{draw}
 
-	%Arrow Part
-	\pgfscope
-	\pgfsetarrowsend{latex}
-	\pgfpathmoveto{\pgfpointadd{\pgfpoint{.3\pgf@circ@res@left}{0}}{\pgfpointpolar{-45}{2.2\pgf@circ@res@up}}}
-	\pgfpathlineto{\pgfpointadd{\pgfpoint{.3\pgf@circ@res@left}{0}}{\pgfpointpolar{-45}{1.3\pgf@circ@res@up}}}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpointadd{\pgfpoint{0}{0.3\pgf@circ@res@up}}{\pgfpointpolar{-45}{2.2\pgf@circ@res@up}}}
-	\pgfpathlineto{\pgfpointadd{\pgfpoint{0}{0.3\pgf@circ@res@up}}{\pgfpointpolar{-45}{1.3\pgf@circ@res@up}}}
-	\pgfusepath{draw}
-	\endpgfscope
+    %Arrow Part
+    \pgfscope
+        \pgfsetarrowsend{latex}
+        \pgfpathmoveto{\pgfpointadd{\pgfpoint{.3\pgf@circ@res@left}{0}}{\pgfpointpolar{-45}{2.2\pgf@circ@res@up}}}
+        \pgfpathlineto{\pgfpointadd{\pgfpoint{.3\pgf@circ@res@left}{0}}{\pgfpointpolar{-45}{1.3\pgf@circ@res@up}}}
+        \pgfusepath{draw}
+        \pgfpathmoveto{\pgfpointadd{\pgfpoint{0}{0.3\pgf@circ@res@up}}{\pgfpointpolar{-45}{2.2\pgf@circ@res@up}}}
+        \pgfpathlineto{\pgfpointadd{\pgfpoint{0}{0.3\pgf@circ@res@up}}{\pgfpointpolar{-45}{1.3\pgf@circ@res@up}}}
+        \pgfusepath{draw}
+    \endpgfscope
 
 }
 
 %% Empty Source
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/esource/height}}{esource}{\ctikzvalof{bipoles/esource/height}}{\ctikzvalof{bipoles/esource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/esource/height}}
+{esource}
+{\ctikzvalof{bipoles/esource/height}}
+{\ctikzvalof{bipoles/esource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
 }
 
 %% DC Current Source with open shape
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/dcisource/height}}{dcisource}{\ctikzvalof{bipoles/dcisource/height}}{\ctikzvalof{bipoles/dcisource/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpointorigin}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}}\pgfpatharc{0}{90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}}\pgfpatharc{0}{-90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}\pgfpatharc{180}{270}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}\pgfpatharc{180}{90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}	
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
-	\pgfscope
-
-	\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/dcisource/height}}
+{dcisource}
+{\ctikzvalof{bipoles/dcisource/height}}
+{\ctikzvalof{bipoles/dcisource/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@maybefill
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}}\pgfpatharc{0}{90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}}\pgfpatharc{0}{-90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}\pgfpatharc{180}{270}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}\pgfpatharc{180}{90}{0.85\pgf@circ@res@right and \pgf@circ@res@up}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
 }
 
 %% DC-Voltage source
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/dcvsource/height}}{dcvsource}{\ctikzvalof{bipoles/dcvsource/height}}{\ctikzvalof{bipoles/dcvsource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@up}{.5\pgf@circ@res@left}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@up}{.5\pgf@circ@res@right}}
-	\pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@down}{.5\pgf@circ@res@left}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@down}{.5\pgf@circ@res@right}}
-	\pgfusepath{draw}	
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/dcvsource/height}}
+{dcvsource}
+{\ctikzvalof{bipoles/dcvsource/height}}
+{\ctikzvalof{bipoles/dcvsource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@up}{.5\pgf@circ@res@left}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@up}{.5\pgf@circ@res@right}}
+    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@down}{.5\pgf@circ@res@left}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@down}{.5\pgf@circ@res@right}}
+    \pgfusepath{draw}
 }
 
 
 %% Independent current source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/isource/height}}{isource}{\ctikzvalof{bipoles/isource/height}}{\ctikzvalof{bipoles/isource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/isource/height}}
+{isource}
+{\ctikzvalof{bipoles/isource/height}}
+{\ctikzvalof{bipoles/isource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+    \pgf@circ@draworfill
 }
 
 %% Independent double oo source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/oosource/height}}{oosource}{\ctikzvalof{bipoles/oosource/height}}{\ctikzvalof{bipoles/oosource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosource/circleoffset}\pgf@circ@res@left}{0}}
-		{\ctikzvalof{bipoles/oosource/circlesize}\pgf@circ@res@left}
-	\pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosource/circleoffset}\pgf@circ@res@right}{0}}
-		{\ctikzvalof{bipoles/oosource/circlesize}\pgf@circ@res@right}	
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/oosource/height}}
+{oosource}
+{\ctikzvalof{bipoles/oosource/height}}
+{\ctikzvalof{bipoles/oosource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosource/circleoffset}\pgf@circ@res@left}{0}}
+        {\ctikzvalof{bipoles/oosource/circlesize}\pgf@circ@res@left}
+    \pgf@circ@maybefill
+    \pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosource/circleoffset}\pgf@circ@res@right}{0}}
+        {\ctikzvalof{bipoles/oosource/circlesize}\pgf@circ@res@right}
+    \pgf@circ@draworfill
+    \pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosource/circleoffset}\pgf@circ@res@left}{0}}
+        {\ctikzvalof{bipoles/oosource/circlesize}\pgf@circ@res@left}
+    \pgfusepath{draw}
 }
 
 
 %% Independent current source - American
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/isourceam/height}}{isourceAM}{\ctikzvalof{bipoles/isourceam/height}}{\ctikzvalof{bipoles/isourceam/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/isourceam/height}}
+{isourceAM}
+{\ctikzvalof{bipoles/isourceam/height}}
+{\ctikzvalof{bipoles/isourceam/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
 
-	\pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
-	\pgfscope
-		\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
-		\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-	\endpgfscope
+    \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
 }
 
 
 %% Independent sinusoidal current source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/isource/height}}{isourcesin}{\ctikzvalof{bipoles/isource/height}}{\ctikzvalof{bipoles/isource/width}}{
-	\pgfpointorigin
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfusepath{draw}
-	
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/isource/height}}
+{isourcesin}
+{\ctikzvalof{bipoles/isource/height}}
+{\ctikzvalof{bipoles/isource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 
 }
 
 
 %% Controlled voltage source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cvsource/height}}{cvsource}{\ctikzvalof{bipoles/cvsource/height}}{\ctikzvalof{bipoles/cvsource/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cvsource/height}}
+{cvsource}
+{\ctikzvalof{bipoles/cvsource/height}}
+{\ctikzvalof{bipoles/cvsource/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathclose
+    \pgf@circ@draworfill
 
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfusepath{draw}		
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
 }
 
 
 
 
 %% Controlled voltage source - American
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cvsourceam/height}}{cvsourceAM}{\ctikzvalof{bipoles/cvsourceam/height}}{\ctikzvalof{bipoles/cvsourceam/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
-
-	\ifpgf@circ@oldvoltagedirection
-		\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@left]{$+$}
-		\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@right]{$-$}
-	\else
-		\pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@left]{$-$}
-		\pgftext[top,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@right]{$+$}
-	\fi
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cvsourceam/height}}
+{cvsourceAM}
+{\ctikzvalof{bipoles/cvsourceam/height}}
+{\ctikzvalof{bipoles/cvsourceam/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathclose
+    \pgf@circ@draworfill
+
+    \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+    \ifpgf@circ@oldvoltagedirection
+        \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@left]{$+$}
+        \pgftext[top,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@right]{$-$}
+    \else
+        \pgftext[bottom,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@left]{$-$}
+        \pgftext[top,rotate=90,y=\ctikzvalof{bipoles/cvsourceam/margin}\pgf@circ@res@right]{$+$}
+    \fi
 }
 
 
 %% Controlled sinusoidal voltage source
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cvsourcesin/height}}{cvsourcesin}{\ctikzvalof{bipoles/cvsourcesin/height}}{\ctikzvalof{bipoles/cvsourcesin/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cvsourcesin/height}}
+{cvsourcesin}
+{\ctikzvalof{bipoles/cvsourcesin/height}}
+{\ctikzvalof{bipoles/cvsourcesin/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-		\pgfscope
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfusepath{draw}		
-		\endpgfscope	
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+        \pgfpathclose
+        \pgf@circ@draworfill
+    \endpgfscope
 
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 
 %% Controlled sinusoidal current source
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cvsourcesin/height}}{cisourcesin}{\ctikzvalof{bipoles/cvsourcesin/height}}{\ctikzvalof{bipoles/cvsourcesin/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cvsourcesin/height}}
+{cisourcesin}
+{\ctikzvalof{bipoles/cvsourcesin/height}}
+{\ctikzvalof{bipoles/cvsourcesin/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-		\pgfscope
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfusepath{draw}		
-		\endpgfscope	
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+        \pgfpathclose
+        \pgf@circ@draworfill
+    \endpgfscope
 
-		\pgf@circ@res@up = .5\pgf@circ@res@up
-		\pgfscope
-			\pgftransformrotate{90}
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
+    \pgf@circ@res@up = .5\pgf@circ@res@up
+    \pgfscope
+        \pgftransformrotate{90}
+        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
+%% Controlled current source
 
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cisource/height}}
+{cisource}
+{\ctikzvalof{bipoles/cisource/height}}
+{\ctikzvalof{bipoles/cisource/width}}
+{
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-%% Controlled current source
-
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cisource/height}}{cisource}{\ctikzvalof{bipoles/cisource/height}}{\ctikzvalof{bipoles/cisource/width}}{
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathclose
+    \pgf@circ@draworfill
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfusepath{draw}		
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
 }
 
 
+%% Controlled current source - American
 
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cisourceam/height}}
+{cisourceAM}
+{\ctikzvalof{bipoles/cisourceam/height}}
+{\ctikzvalof{bipoles/cisourceam/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-%% Controlled current source - American
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathclose
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
+}
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/cisourceam/height}}{cisourceAM}{\ctikzvalof{bipoles/cisourceam/height}}{\ctikzvalof{bipoles/cisourceam/width}}{
+%% Cute Independent voltage source
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-			\pgfusepath{draw}		
-
-	\pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
-	\pgfscope
-		\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
-		\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsource/height}}
+{vsourceC}
+{\ctikzvalof{bipoles/vsource/height}}
+{\ctikzvalof{bipoles/vsource/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfsetroundcap\pgfusepath{draw}
+}
+%% Cute Independent current source
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/isource/height}}
+{isourceC}
+{\ctikzvalof{bipoles/isource/height}}
+{\ctikzvalof{bipoles/isource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{.6\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{.6\pgf@circ@res@down}}
+    \pgfsetroundcap\pgfusepath{draw}
+}
+%% Cute Controlled voltage source
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cvsource/height}}
+{cvsourceC}
+{\ctikzvalof{bipoles/cvsource/height}}
+{\ctikzvalof{bipoles/cvsource/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@draworfill
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfsetroundcap\pgfusepath{draw}
 }
 
+%% Cute Controlled current source
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/cisource/height}}
+{cisourceC}
+{\ctikzvalof{bipoles/cisource/height}}
+{\ctikzvalof{bipoles/cisource/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@draworfill
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@zero}{.6\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{.6\pgf@circ@res@down}}
+    \pgfsetroundcap\pgfusepath{draw}
+}
+
+%%  Noise voltage source
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vsource/height}}
+{vsourceN}
+{\ctikzvalof{bipoles/vsource/height}}
+{\ctikzvalof{bipoles/vsource/width}}
+{
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+        %
+        \pgf@circ@res@step=0.125\pgf@circ@Rlen\relax
+        \edef\pgf@noise@temp{dashed}
+        \edef\pgf@noise@fill{\pgfkeysvalueof{/tikz/circuitikz/bipoles/noise sources/fillcolor}}
+        \ifx\pgf@noise@temp\pgf@noise@fill
+            % fillable in this case
+            \pgf@circ@draworfillandclip
+            \pgfmathsetmacro{\thinner}{.5*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+            \pgfsetlinewidth{\thinner\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            %
+            \advance\pgf@circ@res@up by -4\pgf@circ@res@step \advance\pgf@circ@res@down by -4\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by -\pgf@circ@res@step\advance\pgf@circ@res@down by -\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by -\pgf@circ@res@step\advance\pgf@circ@res@down by -\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfusepath{draw}
+        \else
+            \pgfsetfillcolor{\pgf@noise@fill}
+            \pgfusepath{draw,fill}
+        \fi
+    \endpgfscope
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfsetroundcap\pgfusepath{draw}
+}
+%% Noise current source
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/isource/height}}
+{isourceN}
+{\ctikzvalof{bipoles/isource/height}}
+{\ctikzvalof{bipoles/isource/width}}
+{
+    \pgfpointorigin
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+        %
+        \pgf@circ@res@step=0.125\pgf@circ@Rlen\relax
+        \edef\pgf@noise@temp{dashed}
+        \edef\pgf@noise@fill{\pgfkeysvalueof{/tikz/circuitikz/bipoles/noise sources/fillcolor}}
+        \ifx\pgf@noise@temp\pgf@noise@fill
+            % fillable in this case
+            \pgf@circ@draworfillandclip
+            \pgfmathsetmacro{\thinner}{.5*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+            \pgfsetlinewidth{\thinner\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by \pgf@circ@res@step\advance\pgf@circ@res@down by \pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            %
+            \advance\pgf@circ@res@up by -4\pgf@circ@res@step \advance\pgf@circ@res@down by -4\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by -\pgf@circ@res@step\advance\pgf@circ@res@down by -\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \advance\pgf@circ@res@up by -\pgf@circ@res@step\advance\pgf@circ@res@down by -\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfusepath{draw}
+        \else
+            \pgfsetfillcolor{\pgf@noise@fill}
+            \pgfusepath{draw,fill}
+        \fi
+    \endpgfscope
+    \pgfmathsetmacro{\@@thicker}{3*\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}}
+    \pgfsetlinewidth{\@@thicker\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{.6\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{.6\pgf@circ@res@down}}
+    \pgfsetroundcap\pgfusepath{draw}
+}
 %% Black generic diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fulldiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fulldiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Black Zener diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fullzdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fullzdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Black alternative zigzag Zener diode
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fullzzdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fullzzdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
     \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
@@ -931,175 +1506,227 @@
 
 %% Black Schottky diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fullsdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fullsdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 
 }
 
 %% Black tunnel diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fulltdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fulltdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Black light emitting diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fulllediode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetarrowsend{latex'}
-			\pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
-			\pgfusepath{draw}
-			\pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
-			\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fulllediode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsend{latexslim}
+    \pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 
 }
 
 %% Black photodiode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{fullpdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{fullpdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw,fill}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetarrowsstart{latex'}
-			\pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
-			\pgfusepath{draw}
-			\pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
-			\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfusepath{draw,fill}
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsstart{latexslim}
+    \pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Black varcap
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/varcap/height}}{fullvarcap}{\ctikzvalof{bipoles/varcap/height}}{\ctikzvalof{bipoles/varcap/width}}{
-	\pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-	\pgfsetlinewidth{\pgf@circ@res@temp}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
-	\pgfusepath{draw,fill}
-	%
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/varcap/height}}
+{fullvarcap}
+{\ctikzvalof{bipoles/varcap/height}}
+{\ctikzvalof{bipoles/varcap/width}}
+{
+    \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+    \pgfsetlinewidth{\pgf@circ@res@temp}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+    \pgfusepath{draw,fill}
+    %
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
-%% Empty generic diode
-
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptydiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+%% Code for the diode triangle
+\def\pgf@circ@basicdiodeshape{
+    % \pgfscope
+        \pgftransformxshift{\pgf@circ@res@left}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathclose
+        \pgf@circ@draworfill
+        \pgfscope
+            % to allow filling, we need to draw explicitily the stroke here.
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \ifpgf@circuit@bipole@strokedsymbol
+                \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
+                \pgfpathlineto{\pgfpoint{0pt}{0pt}}
+                \pgfusepath{draw}
+            \fi
+        \endpgfscope
+    % \endpgfscope
+}
 
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+%% Empty generic diode
 
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptydiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Empty Zener diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptyzdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptyzdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-0.6\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-0.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Empty alternative zigzag Zener diode
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptyzzdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptyzzdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
     \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
     \pgfscope
-        \pgftransformxshift{\pgf@circ@res@left}
-        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-        \pgfusepath{draw}
+        \pgf@circ@basicdiodeshape
         \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-1.8\pgf@circ@res@left}{\pgf@circ@res@down-0.5\pgf@circ@res@up}}
         \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
         \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
@@ -1109,337 +1736,688 @@
 }
 %% Empty Schottky diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptysdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptysdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{.6\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-1.4\pgf@circ@res@left}{.6\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 
 }
 
 %% Empty tunnel diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptytdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptytdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Empty light emitting diode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptylediode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
-		
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetarrowsend{latex'}
-			\pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
-			\pgfusepath{draw}
-			\pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
-			\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptylediode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsend{latexslim}
+    \pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Empty photodiode
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/diode/height}}{emptypdiode}{\ctikzvalof{bipoles/diode/height}}{\ctikzvalof{bipoles/diode/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/diode/height}}
+{emptypdiode}
+{\ctikzvalof{bipoles/diode/height}}
+{\ctikzvalof{bipoles/diode/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@left}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@left}{0pt}}
-		\pgfusepath{draw}
-	\endpgfscope
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetarrowsstart{latex'}
-			\pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
-			\pgfusepath{draw}
-			\pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
-			\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfscope
+        \pgf@circ@basicdiodeshape
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsstart{latexslim}
+    \pgfpathmoveto{\pgfpoint{-0.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{2\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.2\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@right}{1.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Empty varcap
 
-\pgfcircdeclarebipole{
-	\anchor{strokepathstart}{
-			\northeast
-				\pgf@y=0cm
-				\advance\pgf@x by -\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth
-				\advance\pgf@x by -\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth
-	}
-	\anchor{strokepathend}{
-		\northeast
-		\pgf@y=0cm
-	}	
-	}{\ctikzvalof{bipoles/varcap/height}}{emptyvarcap}{\ctikzvalof{bipoles/varcap/height}}{\ctikzvalof{bipoles/varcap/width}}{
-	\pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-	\pgfsetlinewidth{\pgf@circ@res@temp}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
-	\pgfusepath{draw}
-	%
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/varcap/height}}
+{emptyvarcap}
+{\ctikzvalof{bipoles/varcap/height}}
+{\ctikzvalof{bipoles/varcap/width}}
+{
+    \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+    \pgfsetlinewidth{\pgf@circ@res@temp}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    % \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+    \pgfpathclose
+    \pgf@circ@draworfill
+    \pgfscope
+        % to allow filling, we need to draw explicitily the stroke here.
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \ifpgf@circuit@bipole@strokedsymbol
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{0pt}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfusepath{draw}
+        \fi
+    \endpgfscope
+    %
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-2\pgf@circ@res@temp}{\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
-%% (Closing) SPST
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/spst/depth}}{cspst}{\ctikzvalof{bipoles/spst/height}}{\ctikzvalof{bipoles/spst/width}}{
+%% Empty bidirectionaldiode
+
+\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/bidirectionaldiode/height}}{emptybidirectionaldiode}{\ctikzvalof{bipoles/bidirectionaldiode/height}}{\ctikzvalof{bipoles/bidirectionaldiode/width}}
+{
+
 	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	
-	\pgfsetarrowsstart{latex'}
-	\pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{0\pgf@circ@res@down}}
-	\pgfpatharcto{1.2\pgf@circ@res@right}{1.2\pgf@circ@res@right}{0}{0}{1}{\pgfpoint{.9\pgf@circ@res@left}{.9\pgf@circ@res@up}}
-	\pgfsetbeveljoin
+
+        \pgf@circ@res@other = \ctikzvalof{bipoles/bidirectionaldiode/diode width left}\pgf@circ@res@left
+        \pgf@circ@res@step = \ctikzvalof{bipoles/bidirectionaldiode/diode width right}\pgf@circ@res@right
+
+	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+        \pgf@circ@draworfill
+	% \pgfusepath{draw}
+
+	\pgfsetlinewidth{\pgfstartlinewidth}
+
+	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
 	\pgfusepath{draw}
+
+}
+
+
+%% Full bidirectionaldiode
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/bidirectionaldiode/height}}
+{fullbidirectionaldiode}
+{\ctikzvalof{bipoles/bidirectionaldiode/height}}
+{\ctikzvalof{bipoles/bidirectionaldiode/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@res@other = \ctikzvalof{bipoles/bidirectionaldiode/diode width left}\pgf@circ@res@left
+    \pgf@circ@res@step = \ctikzvalof{bipoles/bidirectionaldiode/diode width right}\pgf@circ@res@right
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+    \pgfusepath{draw, fill}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
+
+}
+
+%% (Closing) SPST
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/spst/depth}}
+{cspst}
+{\ctikzvalof{bipoles/spst/height}}
+{\ctikzvalof{bipoles/spst/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathmoveto{\pgfpointpolar{90}{1.2\pgf@circ@res@right}}
+        \pgfpatharc{90}{-20}{1.2\pgf@circ@res@right}
+        \pgfsetarrowsend{latexslim}
+        \pgfsetbeveljoin
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Opening SPST
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/spst/depth}}{ospst}{\ctikzvalof{bipoles/spst/height}}{\ctikzvalof{bipoles/spst/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/spst/depth}}
+{ospst}
+{\ctikzvalof{bipoles/spst/height}}
+{\ctikzvalof{bipoles/spst/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	
-	\pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-	\pgfpatharcto{1.1\pgf@circ@res@right}{1.1\pgf@circ@res@right}{0}{0}{1}{\pgfpoint{.7\pgf@circ@res@left}{.9\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{1.2\pgf@circ@res@left}{1\pgf@circ@res@up}}
-	\pgfsetarrowsend{latex'}
-	\pgfsetbeveljoin
-	\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathmoveto{\pgfpointpolar{-10}{1.2\pgf@circ@res@right}}
+        \pgfpatharc{-10}{90}{1.2\pgf@circ@res@right}
+        \pgfsetarrowsend{latexslim}
+        \pgfsetbeveljoin
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Normal open Switch
-\pgfcircdeclarebipole{}{0}{nos}{\ctikzvalof{bipoles/nos/height}}{\ctikzvalof{bipoles/nos/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/nos/depth}}
+{nos}
+{\ctikzvalof{bipoles/nos/height}}
+{\ctikzvalof{bipoles/nos/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfpathlineto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfsetbuttcap
-	\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfsetbuttcap
+    \pgfusepath{draw}
 }
 
 %% Normal closed Switch
-\pgfcircdeclarebipole{}{0}{ncs}{\ctikzvalof{bipoles/ncs/height}}{\ctikzvalof{bipoles/ncs/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfpathlineto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/ncs/depth}}
+{ncs}
+{\ctikzvalof{bipoles/ncs/height}}
+{\ctikzvalof{bipoles/ncs/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% Push Button
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/pushbutton/height 2}}{pushbutton}{\ctikzvalof{bipoles/pushbutton/height}}{\ctikzvalof{bipoles/pushbutton/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{0}{.5\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	
-	\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
-	\pgftransformshift{\pgfpoint{2\pgf@circ@res@right}{0pt}}
-	\pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/pushbutton/height 2}}
+{pushbutton}
+{\ctikzvalof{bipoles/pushbutton/height}}
+{\ctikzvalof{bipoles/pushbutton/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{0}{.5\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
+    \pgftransformshift{\pgfpoint{2\pgf@circ@res@right}{0pt}}
+    \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
 }
 
-% % METERINGSHAPE
-\long\def\drawmeteringcircle{
-	\def\pgf@circ@temp{right}
-	\ifx\tikz@res@label@pos\pgf@circ@temp
-		\pgf@circ@res@step=-1.2\pgf@circ@res@up
-	\else
-		\def\pgf@circ@temp{below}
-		\ifx\tikz@res@label@pos\pgf@circ@temp
-			\pgf@circ@res@step=-1.2\pgf@circ@res@up
-		\else
-			\pgf@circ@res@step=1.2\pgf@circ@res@up
-		\fi
-	\fi
-	%draw connections to circle
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}		
-	\pgfpathlineto{\pgfpoint{.9\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathmoveto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
-	%draw circle
-	\pgfscope
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathcircle{\pgfpointorigin}{.9\pgf@circ@res@up}
-		\pgfusepath{draw}
-	\endpgfscope
-	%draw arrow
-	\pgfscope
-		\pgfsetarrowsend{latex}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
+%% Normally closed Push Button
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/pushbutton/height 2}}
+{ncpushbutton}
+{\ctikzvalof{bipoles/pushbutton/height}}
+{\ctikzvalof{bipoles/pushbutton/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    % This is the radius of the "ocirc" shape (see pgfcircshapes.tex)
+    \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@temp}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@temp}}
+    \pgfpathmoveto{\pgfpoint{0}{-\pgf@circ@res@temp}}
+    \pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    %
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
+    \pgftransformshift{\pgfpoint{2\pgf@circ@res@right}{0pt}}
+    \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
 }
+% cute switch "to" shapes help function
+% #1 -> name
+% #2 -> barposition
+% #3 -> arrowcode
+\long\def\pgfcircdeclarecutesw#1#2#3{
+    \pgfcircdeclarebipole
+    {
+        \savedanchor\midlever{
+            % these values are calculated when we create the definition of the shape.
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/cuteswitch/height}\pgf@circ@Rlen
+            \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+            \pgf@circ@res@temp=\ctikzvalof{bipoles/cuteswitch/thickness}\pgf@circ@res@temp
+            \pgf@circ@res@down = -.5\pgf@y
+            \pgf@circ@res@up = .5\pgf@y
+            \pgfextracty{\pgf@circ@res@other}{#2}
+            \pgf@x=0pt
+            \pgf@y=.5\pgf@circ@res@other
+        }
+        % mid of the lever, to stack switches
+        \anchor{mid}{\midlever}
+        \anchor{out}{\northeast \pgf@y=0cm}
+        \anchor{in}{\southwest\pgf@y=0cm}
+    }
+    {\ctikzvalof{bipoles/cuteswitch/height 2}}
+    {#1}
+    {\ctikzvalof{bipoles/cuteswitch/height}}
+    {\ctikzvalof{bipoles/cuteswitch/width}}{
+        \pgfscope
+        % This is the radius of the "ocirc" shape (see pgfcircshapes.tex)
+        \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgf@circ@res@temp=\ctikzvalof{bipoles/cuteswitch/thickness}\pgf@circ@res@temp
+        \pgfsetlinewidth{2\pgf@circ@res@temp}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{#2}
+        \pgfsetroundcap\pgfusepath{draw}
+        \endpgfscope
+        \pgfscope % arrow
+        #3
+        \endpgfscope
+        \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
+        \pgftransformshift{\pgfpoint{2\pgf@circ@res@right}{0pt}}
+        \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw}}
+    }
+}
+
+%% closed cute switch
+\pgfcircdeclarecutesw{cuteclosedswitch}
+    {\pgfpoint{\pgf@circ@res@right}{1.5\pgf@circ@res@temp}}
+    {}
+
+%% open cute switch
+\pgfcircdeclarecutesw{cuteopenswitch}
+    {\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    {}
+
+%% closing cute switch
+\pgfcircdeclarecutesw{cuteclosingswitch}
+    {\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    {
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
+    \pgfpathmoveto{\pgfpointpolar{70}{1.2\pgf@circ@res@right}}
+    \pgfpatharc{70}{-10}{1.2\pgf@circ@res@right}
+    \pgfsetarrowsend{latexslim}
+    \pgfusepath{draw}
+    }
+
+%% opening cute switch
+\pgfcircdeclarecutesw{cuteopeningswitch}
+    {\pgfpoint{\pgf@circ@res@right}{1.5\pgf@circ@res@temp}}
+    {
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
+    \pgfpathmoveto{\pgfpointpolar{-10}{1.2\pgf@circ@res@right}}
+    \pgfpatharc{-10}{60}{1.2\pgf@circ@res@right}
+    \pgfsetarrowsend{latexslim}
+    \pgfusepath{draw}
+    }
+
+
+% % METERINGSHAPE
+    \long\def\drawmeteringcircle{
+        \def\pgf@circ@temp{right}
+        \ifx\tikz@res@label@pos\pgf@circ@temp
+            \pgf@circ@res@step=-1.2\pgf@circ@res@up
+        \else
+            \def\pgf@circ@temp{below}
+            \ifx\tikz@res@label@pos\pgf@circ@temp
+                \pgf@circ@res@step=-1.2\pgf@circ@res@up
+            \else
+                \pgf@circ@res@step=1.2\pgf@circ@res@up
+            \fi
+        \fi
+        %draw connections to circle
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{.9\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathmoveto{\pgfpoint{.9\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfusepath{draw}
+        %draw circle
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathcircle{\pgfpointorigin}{.9\pgf@circ@res@up}
+            \pgf@circ@draworfill
+        \endpgfscope
+        %draw arrow
+        \pgfscope
+            \pgfsetarrowsend{latex}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfusepath{draw}
+        \endpgfscope
+    }
 %AMPEREMETER
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/ammeter/height}}{ammeter}{\ctikzvalof{bipoles/ammeter/height}}{\ctikzvalof{bipoles/ammeter/width}}{
-	\drawmeteringcircle
-	\pgfnode{circle}{center}{\textbf{A}}{}{}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/ammeter/height}}
+{ammeter}
+{\ctikzvalof{bipoles/ammeter/height}}
+{\ctikzvalof{bipoles/ammeter/width}}
+{
+    \drawmeteringcircle
+    \pgfnode{circle}{center}{\textbf{A}}{}{}
 }
 %OHMMETER
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/ohmmeter/height}}{ohmmeter}{\ctikzvalof{bipoles/ohmmeter/height}}{\ctikzvalof{bipoles/ohmmeter/width}}{
-	\drawmeteringcircle
-	\pgfnode{circle}{center}{\boldmath$\Omega$}{}{}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/ohmmeter/height}}
+{ohmmeter}
+{\ctikzvalof{bipoles/ohmmeter/height}}
+{\ctikzvalof{bipoles/ohmmeter/width}}
+{
+    \drawmeteringcircle
+    \pgfnode{circle}{center}{\boldmath$\Omega$}{}{}
 }
 %VOLTMETER
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/voltmeter/height}}{voltmeter}{\ctikzvalof{bipoles/voltmeter/height}}{\ctikzvalof{bipoles/voltmeter/width}}{
-	\drawmeteringcircle
-	\pgfnode{circle}{center}{\textbf{V}}{}{}
-		
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/voltmeter/height}}
+{voltmeter}
+{\ctikzvalof{bipoles/voltmeter/height}}
+{\ctikzvalof{bipoles/voltmeter/width}}
+{
+    \drawmeteringcircle
+    \pgfnode{circle}{center}{\textbf{V}}{}{}
+
 }
 
+% oscilloscope, suggested by @nobrl https://github.com/circuitikz/circuitikz/issues/176
+\pgfcircdeclarebipole
+{
+    \anchor{in 1}{\southwest\pgf@y=0.75\pgf@y\pgf@x=0.4\pgf@x}
+    \anchor{in 2}{\southwest\pgf@y=0.75\pgf@y\pgf@x=-0.4\pgf@x}
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+}
+{\ctikzvalof{bipoles/oscope/height}}
+{oscope}
+{\ctikzvalof{bipoles/oscope/height}}
+{\ctikzvalof{bipoles/oscope/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfextracty{\pgf@circ@res@up}{\northeast}
+    \pgfextractx{\pgf@circ@res@right}{\northeast}
+    \pgfextractx{\pgf@circ@res@left}{\southwest}
+    \pgfextracty{\pgf@circ@res@down}{\southwest}
+    \pgfmathsetlength{\pgf@circ@res@step}{0.25*\pgf@circ@res@up}
+    \pgfscope
+        \pgfsetcornersarced{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@step}}
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        % this would create a round (analog?) scope...
+        % \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+        \pgf@circ@draworfill
+    \endpgfscope
+    % get the rotation
+    \pgfgettransformentries\a\b\temp\temp\temp\temp
+    \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+    % and unrotate the scope
+    \pgfscope
+        \pgftransformrotate{\rot}
+        % grid
+        \pgfscope
+            \pgfsetlinewidth{0.5\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
+            \pgfpathgrid[stepx=\pgf@circ@res@step, stepy=\pgf@circ@res@step]%
+            {\pgfpoint{0.75\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
+            {\pgfpoint{0.75\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+            \pgfsetstrokeopacity{0.5}
+            \pgfusepath{draw}
+        \endpgfscope
+        % function displayed, thanks to
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0.05\pgf@circ@res@left}{0.25\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.05\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0.65\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.65\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
 %% Short circuit
 
-\pgfcircdeclarebipole{}{0}{short}{0}{0}{ }
+%%% NOTICE that the short is really NOT drawn; we trust the fact that its
+%%% natural length is zero.
+\pgfcircdeclarebipole
+{}
+{0}
+{short}
+{0}
+{0}
+{ }
 
 %% Open circuit
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/open/height}}{open}{\ctikzvalof{bipoles/open/height}}{\ctikzvalof{bipoles/open/width}}{
-
-}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/open/height}}
+{open}
+{\ctikzvalof{bipoles/open/height}}
+{\ctikzvalof{bipoles/open/width}}
+{ }
 
 %% Generic bipole - used as resistor by some (bleah)
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/generic/height}}{generic}{\ctikzvalof{bipoles/generic/height}}{\ctikzvalof{bipoles/generic/width}}{
-
-		%\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		%\divide \pgf@circ@res@step by 14
-
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw} 
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/generic/height}}
+{generic}
+{\ctikzvalof{bipoles/generic/height}}
+{\ctikzvalof{bipoles/generic/width}}
+{
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgf@circ@draworfill
 }
 
 
 %% fuse
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/fuse/height}}{fuse}{\ctikzvalof{bipoles/fuse/height}}{\ctikzvalof{bipoles/fuse/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/fuse/height}}
+{fuse}
+{\ctikzvalof{bipoles/fuse/height}}
+{\ctikzvalof{bipoles/fuse/width}}
+{
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-		\pgfusepath{draw}
-		
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw} 
-}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfusepath{draw}
 
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@draworfill
+}
 
 
-%% Generic bipole, filled - used as inductor by some (bleah)
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/fullgeneric/height}}{fullgeneric}{\ctikzvalof{bipoles/fullgeneric/height}}{\ctikzvalof{bipoles/fullgeneric/width}}{
+%% Generic bipole, filled - used as inductor by some
 
-		%\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		%\divide \pgf@circ@res@step by 14
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/fullgeneric/height}}
+{fullgeneric}
+{\ctikzvalof{bipoles/fullgeneric/height}}
+{\ctikzvalof{bipoles/fullgeneric/width}}
+{
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw,fill} 
+    \pgfusepath{draw,fill}
 }
 
+%% Generic sensor, filled - used as inductive sensor by some
+
+\pgfcircdeclarebipole
+{{% anchor for labelling the type of dependency
+    \anchor{label}{%
+        \southwest
+        \pgf@x=0.4\pgf@x
+        \pgf@y=2\pgf@y
+    }%
+}}
+{\ctikzvalof{bipoles/fullgeneric/height}}
+{sfullgeneric}
+{\ctikzvalof{bipoles/fullgeneric/height}}
+{\ctikzvalof{bipoles/fullgeneric/width}}
+{
+
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfusepath{draw,fill}
+    %\pgfscope
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-2\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{2\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{2\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    %\endpgfscope
+}
 
-%% Generic asymmetric bipole 
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/ageneric/height}}{ageneric}{\ctikzvalof{bipoles/ageneric/height}}{\ctikzvalof{bipoles/ageneric/width}}{
-		%\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		%\divide \pgf@circ@res@step by 14
+%% Generic asymmetric bipole
 
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw} 
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/ageneric/height}}
+{ageneric}
+{\ctikzvalof{bipoles/ageneric/height}}
+{\ctikzvalof{bipoles/ageneric/width}}
+{
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
 
-			\pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-			\pgfusepath{stroke,fill}		
+    \pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{stroke,fill}
 }
 
 
 %% asymmetric fuse
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/afuse/height}}{afuse}{\ctikzvalof{bipoles/afuse/height}}{\ctikzvalof{bipoles/afuse/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/afuse/height}}
+{afuse}
+{\ctikzvalof{bipoles/afuse/height}}
+{\ctikzvalof{bipoles/afuse/width}}
+{
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfusepath{draw}
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-		\pgfusepath{draw}
-		
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw}
-		
-		\pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-			\pgfusepath{stroke,fill}		 
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+
+    \pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{stroke,fill}
 }
 
 
@@ -1447,28 +2425,36 @@
 
 %% Memristor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/memristor/height}}{memristor}{\ctikzvalof{bipoles/memristor/height}}{\ctikzvalof{bipoles/memristor/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 14
-
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.72*\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.72*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.35*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.35*\pgf@circ@res@left}{-\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-.05*\pgf@circ@res@left}{-\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-.05*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.42*\pgf@circ@res@right}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.42*\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{.8*\pgf@circ@res@right}{0pt}}
-					
-		\pgfusepath{draw} 
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/memristor/height}}
+{memristor}
+{\ctikzvalof{bipoles/memristor/height}}
+{\ctikzvalof{bipoles/memristor/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 14
 
-			\pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-			\pgfusepath{stroke,fill}		
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.72*\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.72*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.35*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.35*\pgf@circ@res@left}{-\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{-.05*\pgf@circ@res@left}{-\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{-.05*\pgf@circ@res@left}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.42*\pgf@circ@res@right}{\ctikzvalof{bipoles/memristor/wave height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.42*\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{.8*\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
+
+    \pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{stroke,fill}
 }
 
 
@@ -1476,148 +2462,210 @@
 
 %% Generic empty tunable
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/tgeneric/height}}{tgeneric}{\ctikzvalof{bipoles/tgeneric/height}}{\ctikzvalof{bipoles/tgeneric/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{.4\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/tgeneric/height}}
+{tgeneric}
+{\ctikzvalof{bipoles/tgeneric/height}}
+{\ctikzvalof{bipoles/tgeneric/width}}
+{
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{.4\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgf@circ@draworfill
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 %% Photoresistor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/photoresistor/height 2}}{photoresistor}{\ctikzvalof{bipoles/photoresistor/height}}{\ctikzvalof{bipoles/photoresistor/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.3\pgf@circ@res@right}{-1.2\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.05\pgf@circ@res@right}{-1.2\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\endpgfscope
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/photoresistor/height 2}}
+{photoresistor}
+{\ctikzvalof{bipoles/photoresistor/height}}
+{\ctikzvalof{bipoles/photoresistor/width}}
+{
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.3\pgf@circ@res@right}{-1.2\pgf@circ@res@down}}
+        \pgfusepath{draw}
+        \pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.05\pgf@circ@res@right}{-1.2\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 
 
 %% Thermistor
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/thermistor/height}}{thermistor}{\ctikzvalof{bipoles/thermistor/height}}{\ctikzvalof{bipoles/thermistor/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistor/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistor/main}\pgf@circ@res@up}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		%\pgfscope
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		%\endpgfscope
+\pgfcircdeclarebipole
+{{% anchor for labelling the type of dependency
+    \anchor{label}{%
+        \southwest
+        \pgf@x=0.4\pgf@x
+        \pgf@y=1.2\pgf@y
+    }%
+}}
+{\ctikzvalof{bipoles/thermistor/height}}
+{thermistor}
+{\ctikzvalof{bipoles/thermistor/height}}
+{\ctikzvalof{bipoles/thermistor/width}}
+{
+    \pgfscope
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistor/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistor/main}\pgf@circ@res@up}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgf@circ@draworfill
+    \endpgfscope
+
+    %\pgfscope
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{1.2\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{1.2\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    %\endpgfscope
 }
 
 
 %% Thermistor PTC
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/thermistorptc/height 2}}{thermistorptc}{\ctikzvalof{bipoles/thermistorptc/height}}{\ctikzvalof{bipoles/thermistorptc/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorptc/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorptc/main}\pgf@circ@res@up}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{-\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\tiny$\vartheta$}
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/thermistorptc/height 2}}
+{thermistorptc}
+{\ctikzvalof{bipoles/thermistorptc/height}}
+{\ctikzvalof{bipoles/thermistorptc/width}}
+{
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorptc/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorptc/main}\pgf@circ@res@up}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{-\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\tiny$\vartheta$}
+    \pgfsetarrowsend{latexslim}
+    \pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
+    \pgfusepath{draw}
 }
 
 %% Thermistor NTC
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/thermistorntc/height 2}}{thermistorntc}{\ctikzvalof{bipoles/thermistorntc/height}}{\ctikzvalof{bipoles/thermistorntc/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorntc/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorntc/main}\pgf@circ@res@up}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{-\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\tiny$\vartheta$}
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/thermistorntc/height 2}}
+{thermistorntc}
+{\ctikzvalof{bipoles/thermistorntc/height}}
+{\ctikzvalof{bipoles/thermistorntc/width}}
+{
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorntc/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/thermistorntc/main}\pgf@circ@res@up}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{-\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgftext[top,x=.85\pgf@circ@res@left,y=.75\pgf@circ@res@down]{\tiny$\vartheta$}
+    \pgfsetarrowsend{latexslim}
+    \pgfpathmoveto{\pgfpoint{.62\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.62\pgf@circ@res@left}{.7\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{.45\pgf@circ@res@left}{.7\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.45\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
 }
 
 %% thermocouple
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/thermocouple/height 2}}{thermocouple}{\ctikzvalof{bipoles/thermocouple/height}}{\ctikzvalof{bipoles/thermocouple/width}}{
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/thermocouple/height 2}}
+{thermocouple}
+{\ctikzvalof{bipoles/thermocouple/height}}
+{\ctikzvalof{bipoles/thermocouple/width}}
+{
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathlineto{\pgfpoint{0}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}}
+    \pgfusepath{draw}
 }
 
 %% Varistor
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/varistor/height}}{varistor}{\ctikzvalof{bipoles/varistor/height}}{\ctikzvalof{bipoles/varistor/width}}{
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/varistor/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/varistor/main}\pgf@circ@res@up}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw}
-		
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\pgftext[top,x=.65\pgf@circ@res@left,y=1.2\pgf@circ@res@down]{{\tiny\textsf{U}}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/varistor/height}}
+{varistor}
+{\ctikzvalof{bipoles/varistor/height}}
+{\ctikzvalof{bipoles/varistor/width}}
+{
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/varistor/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\pgfkeysvalueof{/tikz/circuitikz/bipoles/varistor/main}\pgf@circ@res@up}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    \pgftext[top,x=.65\pgf@circ@res@left,y=1.2\pgf@circ@res@down]{{\tiny\textsf{U}}}
 }
 
 
 
 %% Generic full tunable
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/tfullgeneric/height}}{tfullgeneric}{\ctikzvalof{bipoles/tfullgeneric/height}}{\ctikzvalof{bipoles/tfullgeneric/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 14
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/tfullgeneric/height}}
+{tfullgeneric}
+{\ctikzvalof{bipoles/tfullgeneric/height}}
+{\ctikzvalof{bipoles/tfullgeneric/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 14
+
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{.4\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfusepath{draw,fill}
 
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{.4\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfusepath{draw,fill}
-		
-		\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\endpgfscope
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{.5\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.5\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
@@ -1628,54 +2676,67 @@
 
 %% Variable Capacitor
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vcapacitor/height}}{vcapacitor}{\ctikzvalof{bipoles/vcapacitor/height}}{\ctikzvalof{bipoles/vcapacitor/width}}{
-		%\pgf@circ@res@step = \ctikzvalof{bipoles/vcapacitor/width}\pgf@circ@Rlen
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vcapacitor/capacitor width} \pgf@circ@res@right
-
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@down}}
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfusepath{draw}
-}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vcapacitor/height}}
+{vcapacitor}
+{\ctikzvalof{bipoles/vcapacitor/height}}
+{\ctikzvalof{bipoles/vcapacitor/width}}
+{
+    %\pgf@circ@res@step = \ctikzvalof{bipoles/vcapacitor/width}\pgf@circ@Rlen
+    \pgf@circ@res@step = \ctikzvalof{bipoles/vcapacitor/capacitor width} \pgf@circ@res@right
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@down}}
 
-%% Piezoelectric Element
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/piezoelectric/height}}{piezoelectric}{\ctikzvalof{bipoles/piezoelectric/height}}{\ctikzvalof{bipoles/piezoelectric/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/piezoelectric/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 5
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfusepath{draw}
+}
 
-		%% Outer markings
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
 
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
+%% Piezoelectric Element
 
-		%% Inner Box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left+4}{\pgf@circ@res@up-1}}{\pgfpoint{\pgf@circ@res@right-4}{\pgf@circ@res@down+1}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/piezoelectric/height}}
+{piezoelectric}
+{\ctikzvalof{bipoles/piezoelectric/height}}
+{\ctikzvalof{bipoles/piezoelectric/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/piezoelectric/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 5
+
+    %% Outer markings
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    %% Inner Box
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left+4}{\pgf@circ@res@up-1}}{\pgfpoint{\pgf@circ@res@right-4}{\pgf@circ@res@down+1}}
+        \pgf@circ@draworfill
+    \endpgfscope
 }
 
 
@@ -1721,41 +2782,41 @@
 
 \def\drawpoles{
 	\pgfextra{ \edef\pgf@circ@temp{\ctikzvalof{bipole/nodes/left}} \def\pgf@temp{diamond}  }
-	\ifx\pgf@temp\pgf@circ@temp 
-		 (\tikztostart) node[diamondpole] {} 
-	\else 
+	\ifx\pgf@temp\pgf@circ@temp
+		 (\tikztostart) node[diamondpole] {}
+	\else
 		\pgfextra{ \def\pgf@temp{empty}  }
-		\ifx\pgf@temp\pgf@circ@temp 
-			 (\tikztostart) node[ocirc] {} 
-		\else 
+		\ifx\pgf@temp\pgf@circ@temp
+			 (\tikztostart) node[ocirc] {}
+		\else
 			\pgfextra{  \def\pgf@temp{full}  }
-			\ifx\pgf@temp\pgf@circ@temp 
-				(\tikztostart) node[circ] {} 
-			\else 
+			\ifx\pgf@temp\pgf@circ@temp
+				(\tikztostart) node[circ] {}
+			\else
 				\pgfextra{ \def\pgf@temp{rectjoinfill} }
-				\ifx\pgf@temp\pgf@circ@temp 
-				 (\tikztostart) node[rectjoinfill] {} 
-				\else 
+				\ifx\pgf@temp\pgf@circ@temp
+				 (\tikztostart) node[rectjoinfill] {}
+				\else
 				\fi
 			\fi
 		\fi
 	\fi
 	\pgfextra{ \edef\pgf@circ@temp{\ctikzvalof{bipole/nodes/right}} \def\pgf@temp{diamond}  }
-	\ifx\pgf@temp\pgf@circ@temp 
-		 (\tikztotarget) node[diamondpole] {} 
-	\else 
+	\ifx\pgf@temp\pgf@circ@temp
+		 (\tikztotarget) node[diamondpole] {}
+	\else
 		\pgfextra{ \def\pgf@temp{empty}  }
-		\ifx\pgf@temp\pgf@circ@temp 
-			 (\tikztotarget) node[ocirc] {} 
-		\else 
+		\ifx\pgf@temp\pgf@circ@temp
+			 (\tikztotarget) node[ocirc] {}
+		\else
 			\pgfextra{  \def\pgf@temp{full}  }
-			\ifx\pgf@temp\pgf@circ@temp 
-				(\tikztotarget) node[circ] {} 
-			\else 
+			\ifx\pgf@temp\pgf@circ@temp
+				(\tikztotarget) node[circ] {}
+			\else
 				\pgfextra{ \def\pgf@temp{rectjoinfill} }
-				\ifx\pgf@temp\pgf@circ@temp 
-				 (\tikztotarget) node[rectjoinfill] {} 
-				\else 
+				\ifx\pgf@temp\pgf@circ@temp
+				 (\tikztotarget) node[rectjoinfill] {}
+				\else
 				\fi
 			\fi
 		\fi
@@ -1766,1294 +2827,1456 @@
 
 %% Lamp
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/lamp/height}}{lamp}{\ctikzvalof{bipoles/lamp/height}}{\ctikzvalof{bipoles/lamp/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/lamp/height}}
+{lamp}
+{\ctikzvalof{bipoles/lamp/height}}
+{\ctikzvalof{bipoles/lamp/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{.7071*\pgf@circ@res@left}{.7071*\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.7071*\pgf@circ@res@right}{.7071*\pgf@circ@res@down}}
-	\pgfpathmoveto{\pgfpoint{.7071*\pgf@circ@res@left}{.7071*\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{.7071*\pgf@circ@res@right}{.7071*\pgf@circ@res@up}}
-	\pgfusepath{draw}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{.7071*\pgf@circ@res@left}{.7071*\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.7071*\pgf@circ@res@right}{.7071*\pgf@circ@res@down}}
+    \pgfpathmoveto{\pgfpoint{.7071*\pgf@circ@res@left}{.7071*\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{.7071*\pgf@circ@res@right}{.7071*\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
-
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/tline/height}
-                        }{tline}{\ctikzvalof{bipoles/tline/height}
-                                 }{\ctikzvalof{bipoles/tline/width}
-                                   }    
-          {
-          \pgf@circ@res@step=.2\pgf@circ@res@right % half x axis
-          \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-          \pgfpathellipse{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{0}}
-                         {\pgfpoint{\pgf@circ@res@step}{0}}
-                         {\pgfpoint{0}{-\pgf@circ@res@up}}
-          \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{\pgf@circ@res@up}}
-          \pgfpathlineto{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@step}{\pgf@circ@res@up}}
-          \pgfpatharc{-90}{90}{-\pgf@circ@res@step and -\pgf@circ@res@up}
-          \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{\pgf@circ@res@down}}
-          \pgfusepath{draw}
+%% bulb
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/bulb/height}}
+{bulb}
+{\ctikzvalof{bipoles/bulb/height}}
+{\ctikzvalof{bipoles/bulb/width}}
+{%
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{0.8\pgf@circ@res@up}}{\pgfpoint{0.8\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpatharc{0}{-180}{0.4*\pgf@circ@res@left}
+    \pgfsetbeveljoin
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
 }
 
 
+% transmission line
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/tline/height}}
+{tline}
+{\ctikzvalof{bipoles/tline/height}}
+{\ctikzvalof{bipoles/tline/width}}
+{
+    \pgf@circ@res@step=.2\pgf@circ@res@right % half x axis
+    \begin{pgftransparencygroup}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@step}{\pgf@circ@res@up}}
+        \pgfpatharc{-90}{90}{-\pgf@circ@res@step and -\pgf@circ@res@up}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{\pgf@circ@res@down}}
+        \pgf@circ@draworfill
+        \pgfpathellipse{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{0pt}}
+        {\pgfpoint{\pgf@circ@res@step}{0pt}}{\pgfpoint{0pt}{-\pgf@circ@res@up}}
+        \pgf@circ@draworfill
+    \end{pgftransparencygroup}
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfusepath{stroke}
+}
 
-
+% microstrip transmission line
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/mstline/height}}
+{mstline}
+{\ctikzvalof{bipoles/mstline/height}}
+{\ctikzvalof{bipoles/mstline/width}}
+{
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+    \pgf@circ@draworfill
+}
 %% SQUID added by Cor Molenaar 5 March 2010
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/squid/height}}{squid}{\ctikzvalof{bipoles/squid/height}}{\ctikzvalof{bipoles/squid/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/squid/height}}
+{squid}
+{\ctikzvalof{bipoles/squid/height}}
+{\ctikzvalof{bipoles/squid/width}}
+{
 
-	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{1.35*\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.65*\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.65*\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{1.35*\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{1.35*\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.65*\pgf@circ@res@down}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.65*\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{1.35*\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfusepath{draw}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{1.35*\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.65*\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.65*\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{1.35*\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{1.35*\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.65*\pgf@circ@res@down}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.65*\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{1.35*\pgf@circ@res@down}}
+
+    \pgfusepath{draw}
 }
 
 
 
 % Generic barrier added by Cor Molenaar 5 March 2010
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/barrier/height}}{barrier}{\ctikzvalof{bipoles/barrier/height}}{\ctikzvalof{bipoles/barrier/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/barrier/height}}
+{barrier}
+{\ctikzvalof{bipoles/barrier/height}}
+{\ctikzvalof{bipoles/barrier/width}}
+{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@step}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@step}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.35*\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.35*\pgf@circ@res@down}}
-	\pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.35*\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.35*\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.35*\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.35*\pgf@circ@res@down}}
+    \pgfpathmoveto{\pgfpoint{0.35*\pgf@circ@res@left}{0.35*\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.35*\pgf@circ@res@right}{0.35*\pgf@circ@res@up}}
 
-	\pgfusepath{draw}
+    \pgfusepath{draw}
 }
 
 
 % Contributed by Danilo Piazzalunga
- 
+
 \pgfdeclareshape{buffer}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/buffer/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/buffer/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfusepath{draw}
-	\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	
-		\pgfusepath{draw}
-	  
-	  }
-	}
+{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/buffer/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/buffer/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfscope
+            \pgfsetlinewidth{2\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+
+        \pgfusepath{draw}
+
+    }
+}
 
 
 
 
 
 \pgfdeclareshape{plain amp}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }	  
-	  \anchor{-}{
-		\inOne
-	  }
-	  \anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\up{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-	    \pgfpointlineattime{
-			\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/up pos}}{
-			\pgfpoint{
-				\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
-				{\pgf@circ@res@up}}
-			{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	  }
-	  \anchor{up}{
-		\up
-	  }
-	  \anchor{down}{
-		\up
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@up}}
-	
-
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@down}}
-		
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	
-	\pgfusepath{draw}
+{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgfscope
+            \pgfsetlinewidth{2\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@up}}
+
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/plain amp/input height}\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
 
-						
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfusepath{draw}
-	\endpgfscope
-		
-		
-	  
-	  }
-	}
-	
-%% Generic two port box
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/twoport/height}}{twoport}{\ctikzvalof{bipoles/twoport/height}}{\ctikzvalof{bipoles/twoport/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-		
-		% draw inner symbol
-		\pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
-		
-}
+        \pgfusepath{draw}
 
-%% voltage controled oscillator
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vco/width}}{vco}{\ctikzvalof{bipoles/twoport/width}}{\ctikzvalof{bipoles/vco/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vco/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		% draw circle
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@step}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
 
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-		
-		% draw inner sine waves
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{-.5\pgf@circ@res@step}{0\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		
-}
 
-%% bandpass filter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/bandpass/width}}{bandpass}{\ctikzvalof{bipoles/bandpass/width}}{\ctikzvalof{bipoles/bandpass/width}}{
-		
-		\pgf@circ@res@step = \ctikzvalof{bipoles/bandpass/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-		
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
-		\pgfusepath{draw}
+
+
+    }
 }
 
-%% bandstop filter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/bandstop/width}}{bandstop}{\ctikzvalof{bipoles/bandstop/width}}{\ctikzvalof{bipoles/bandstop/width}}{
-	\pgf@circ@res@step = \ctikzvalof{bipoles/bandstop/width}\pgf@circ@Rlen
-	\divide \pgf@circ@res@step by 2
 
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgf@circ@res@other = \pgf@circ@res@left
-	\advance\pgf@circ@res@other by \pgf@circ@res@step
+%% Draw the two-port fillable box
+\def\pgf@circ@twoportbox{
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgf@circ@draworfill
+    \endpgfscope
+}
 
-	\ifpgf@circuit@dashed
-	\pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-	\fi
+%% Generic two port box
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/twoport/height}}
+{twoport}
+{\ctikzvalof{bipoles/twoport/height}}
+{\ctikzvalof{bipoles/twoport/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+    % draw outer box
+    \pgf@circ@twoportbox
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
 
-	% draw outer box
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfusepath{draw}
+}
 
-	\ifpgf@circuit@inputarrow
-	{
-		\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-		\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-	}
-	\fi
+%% voltage controled oscillator
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vco/width}}
+{vco}
+{\ctikzvalof{bipoles/twoport/width}}
+{\ctikzvalof{bipoles/vco/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/vco/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+    % draw circle
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@step}
+        \pgf@circ@draworfill
+    \endpgfscope
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner sine waves
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-.5\pgf@circ@res@step}{0\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
 
-	% rotate inner symbol
-	\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-	\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-	\pgftransformrotate{270}
-	\fi\fi
-	\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225% 134 degree, because >= 135 is not possible
-	\pgftransformrotate{180}
-	\fi\fi
-	\ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-	\pgftransformrotate{90}
-	\fi\fi
-
-	% draw inner symbol
-	\pgfsetdash{}{0pt}% always draw solid line for inner symbol
-	\pgfsetarrows{-}%never draw arrows
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfusepath{draw}
+}
 
-	\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-	\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-	\pgfusepath{draw}
+%% bandpass filter
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/bandpass/width}}
+{bandpass}
+{\ctikzvalof{bipoles/bandpass/width}}
+{\ctikzvalof{bipoles/bandpass/width}}
+{
+
+    \pgf@circ@res@step = \ctikzvalof{bipoles/bandpass/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
+    \pgfusepath{draw}
+}
 
-	\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-	\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-	\pgfusepath{draw}
+%% bandstop filter
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/bandstop/width}}
+{bandstop}
+{\ctikzvalof{bipoles/bandstop/width}}
+{\ctikzvalof{bipoles/bandstop/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/bandstop/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225% 134 degree, because >= 135 is not possible
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}% always draw solid line for inner symbol
+    \pgfsetarrows{-}%never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 %% highpass filter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/highpass/width}}{highpass}{\ctikzvalof{bipoles/highpass/width}}{\ctikzvalof{bipoles/highpass/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/highpass/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/highpass/width}}
+{highpass}
+{\ctikzvalof{bipoles/highpass/width}}
+{\ctikzvalof{bipoles/highpass/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/highpass/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 %% lowpass filter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/lowpass/width}}{lowpass}{\ctikzvalof{bipoles/lowpass/width}}{\ctikzvalof{bipoles/lowpass/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/lowpass/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-		\pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/lowpass/width}}
+{lowpass}
+{\ctikzvalof{bipoles/lowpass/width}}
+{\ctikzvalof{bipoles/lowpass/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/lowpass/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 %% ADC
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/adc/width}}{adc}{\ctikzvalof{bipoles/adc/width}}{\ctikzvalof{bipoles/adc/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/adc/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\texti{A}
-		\def\textii{D}
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\def\texti{D}
-			\def\textii{A}
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\def\texti{D}
-			\def\textii{A}
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-			\def\texti{A}
-			\def\textii{D}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows				
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		
-		\pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
-		\pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/adc/width}}
+{adc}
+{\ctikzvalof{bipoles/adc/width}}
+{\ctikzvalof{bipoles/adc/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/adc/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\texti{A}
+    \def\textii{D}
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \def\texti{D}
+        \def\textii{A}
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \def\texti{D}
+        \def\textii{A}
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+        \def\texti{A}
+        \def\textii{D}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
+    \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
 }
 
 %% DAC
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/dac/width}}{dac}{\ctikzvalof{bipoles/dac/width}}{\ctikzvalof{bipoles/dac/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/dac/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\texti{D}
-		\def\textii{A}
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\def\texti{A}
-			\def\textii{D}
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-			\def\texti{A}
-			\def\textii{D}
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-			\def\texti{D}
-			\def\textii{A}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows				
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		
-		\pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
-		\pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/dac/width}}
+{dac}
+{\ctikzvalof{bipoles/dac/width}}
+{\ctikzvalof{bipoles/dac/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/dac/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\texti{D}
+    \def\textii{A}
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \def\texti{A}
+        \def\textii{D}
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+        \def\texti{A}
+        \def\textii{D}
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+        \def\texti{D}
+        \def\textii{A}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
+    \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
 }
 
 %% DSP
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/dsp/width}}{dsp}{\ctikzvalof{bipoles/dsp/width}}{\ctikzvalof{bipoles/dsp/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/dsp/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgftext[center,x=0,y=0]{\textsf{DSP}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/dsp/width}}
+{dsp}
+{\ctikzvalof{bipoles/dsp/width}}
+{\ctikzvalof{bipoles/dsp/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/dsp/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgftext[center,x=0,y=0]{\textsf{DSP}}
 }
 
 %% FFT
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/fft/width}}{fft}{\ctikzvalof{bipoles/fft/width}}{\ctikzvalof{bipoles/fft/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/fft/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgftext[center,x=0,y=0]{\textsf{FFT}}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/fft/width}}
+{fft}
+{\ctikzvalof{bipoles/fft/width}}
+{\ctikzvalof{bipoles/fft/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/fft/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgftext[center,x=0,y=0]{\textsf{FFT}}
 }
 
 %% Amplifier
-\pgfcircdeclarebipole{}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{amp}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/amp/width}\pgf@circ@Rlen
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi		
-
-		% draw outer box
-		\ifpgf@circuit@boxed
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
-			\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-		\fi
-		
-		% draw input arrow
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-
-		\ifpgf@circuit@boxed
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
-			\pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
-		\else
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
-		\fi
-		
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
-		\pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
-
-		\pgfpathclose
-		\pgfusepath{draw}
-		
-		% draw inner text
-		\pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+\pgfcircdeclarebipole
+{}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{amp}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/amp/width}\pgf@circ@Rlen
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \ifpgf@circuit@boxed
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+    \pgf@circ@draworfill
+    \fi
+
+    % draw input arrow
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    \ifpgf@circuit@boxed
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
+        \pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
+    \else
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \fi
+
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
+    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
+
+    \pgfpathclose
+    \pgf@circ@draworfill
+
+    % draw inner text
+    \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
 }
 
 
 %% variable amplifier
-\pgfcircdeclarebipole{}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{vamp}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{
-		\ifpgf@circuit@boxed
-			\ctikzvalof{bipoles/twoport/width}
-		\else
-			\ctikzvalof{bipoles/amp/width}
-		\fi
-	}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/amp/width}\pgf@circ@Rlen
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\ifpgf@circuit@boxed
-			\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-		\fi
-
-		% draw input arrow
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-
-		\ifpgf@circuit@boxed
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
-			\pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
-		\else
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
-		\fi
-		
-
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
-		\pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
-
-		\pgfpathclose
-		\pgfusepath{draw}
-		
-		% draw inner text
-		\pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
-		
-		% draw arrow
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfsetarrowsend{latex}
-		\pgfpathmoveto{\pgfpoint{-0.8\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@step}{0.6\pgf@circ@res@step}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{vamp}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{
+    \ifpgf@circuit@boxed
+        \ctikzvalof{bipoles/twoport/width}
+    \else
+        \ctikzvalof{bipoles/amp/width}
+    \fi
+}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/amp/width}\pgf@circ@Rlen
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \ifpgf@circuit@boxed
+        \pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+    \fi
+
+    % draw input arrow
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    \ifpgf@circuit@boxed
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
+        \pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
+    \else
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \fi
+
+
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
+    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
+
+    \pgfpathclose
+    \pgf@circ@draworfill
+
+    % draw inner text
+    \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+
+    % draw arrow
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsend{latex}
+    \pgfpathmoveto{\pgfpoint{-0.8\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@step}{0.6\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 %% pi attenuator
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/piattenuator/width}}{piattenuator}{\ctikzvalof{bipoles/piattenuator/width}}{\ctikzvalof{bipoles/piattenuator/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/piattenuator/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/piattenuator/width}}
+{piattenuator}
+{\ctikzvalof{bipoles/piattenuator/width}}
+{\ctikzvalof{bipoles/piattenuator/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/piattenuator/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% variable pi attenuator
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vpiattenuator/width}}{vpiattenuator}{\ctikzvalof{bipoles/vpiattenuator/width}}{\ctikzvalof{bipoles/vpiattenuator/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vpiattenuator/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-
-		\pgfsetarrowsend{latex}
-		\pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vpiattenuator/width}}
+{vpiattenuator}
+{\ctikzvalof{bipoles/vpiattenuator/width}}
+{\ctikzvalof{bipoles/vpiattenuator/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/vpiattenuator/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetarrowsend{latex}
+    \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% T attenuator
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/tattenuator/width}}{tattenuator}{\ctikzvalof{bipoles/tattenuator/width}}{\ctikzvalof{bipoles/tattenuator/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/tattenuator/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/tattenuator/width}}
+{tattenuator}
+{\ctikzvalof{bipoles/tattenuator/width}}
+{\ctikzvalof{bipoles/tattenuator/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/tattenuator/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% variable T attenuator
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vtattenuator/width}}{vtattenuator}{\ctikzvalof{bipoles/vtattenuator/width}}{\ctikzvalof{bipoles/vtattenuator/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vtattenuator/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-
-		% draw inner symbol
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		
-		\pgfsetarrowsend{latex}
-		\pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/vtattenuator/width}}
+{vtattenuator}
+{\ctikzvalof{bipoles/vtattenuator/width}}
+{\ctikzvalof{bipoles/vtattenuator/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/vtattenuator/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % draw inner symbol
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    \pgfsetarrowsend{latex}
+    \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% phase shifter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/phaseshifter/width}}{phaseshifter}{\ctikzvalof{bipoles/phaseshifter/width}}{\ctikzvalof{bipoles/phaseshifter/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/phaseshifter/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-		
-		% inner symbol
-		\pgftext[center,x=0,y=0]{\Large$\varphi$}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/phaseshifter/width}}
+{phaseshifter}
+{\ctikzvalof{bipoles/phaseshifter/width}}
+{\ctikzvalof{bipoles/phaseshifter/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/phaseshifter/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % inner symbol
+    \pgftext[center,x=0,y=0]{\Large$\varphi$}
 }
 
 %% variable phase shifter
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/phaseshifter/width}}{vphaseshifter}{\ctikzvalof{bipoles/vphaseshifter/width}}{\ctikzvalof{bipoles/vphaseshifter/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vphaseshifter/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% rotate inner symbol
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-			\pgftransformrotate{270}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-			\pgftransformrotate{180}
-		\fi\fi
-		\ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-			\pgftransformrotate{90}
-		\fi\fi
-		
-		% inner symbol
-		\pgftext[center,x=0,y=0]{\Large$\varphi$}
-		
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfsetarrowsend{latex}
-		\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.65\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.65\pgf@circ@res@up}}
-		\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/phaseshifter/width}}
+{vphaseshifter}
+{\ctikzvalof{bipoles/vphaseshifter/width}}
+{\ctikzvalof{bipoles/vphaseshifter/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/vphaseshifter/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % rotate inner symbol
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \pgftransformrotate{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
+        \pgftransformrotate{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
+        \pgftransformrotate{90}
+    \fi\fi
+
+    % inner symbol
+    \pgftext[center,x=0,y=0]{\Large$\varphi$}
+
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfsetarrowsend{latex}
+    \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.65\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.65\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 %% detector
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/detector/width}}{detector}{\ctikzvalof{bipoles/detector/width}}{\ctikzvalof{bipoles/detector/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/detector/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 2
-
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgf@circ@res@other = \pgf@circ@res@left
-		\advance\pgf@circ@res@other by \pgf@circ@res@step 
-		
-		\ifpgf@circuit@dashed
-			\pgfsetdash{{0.1cm}{0.1cm}}{0cm} 
-		\fi	
-		
-		% draw outer box
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@inputarrow
-			{
-				\advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
-				\pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-			}
-		\fi
-		
-		% draw inner stuff
-		\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-		\pgfsetarrows{-} %never draw arrows
-		\pgfsetlinewidth{0.8\pgfstartlinewidth}
-		\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0}}
-		\pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@right}{0}}
-		\pgfusepath{draw}
-		
-		\ifpgf@circuit@fulldiode
-			\pgfmathparse{2\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/generic/width}}
-			\pgftransformscale{\pgfmathresult}
-			\pgfnode{fulldiodeshape}{center}{}{pgf@fulldiode}{\pgfusepath{fill}}
-		\else
-			\pgfmathparse{2\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/resistor/width}}
-			\pgftransformscale{\pgfmathresult}
-			\pgfnode{emptydiodeshape}{center}{}{pgf@emptydiode}{\pgfusepath{fill}}
-		\fi
-		
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/detector/width}}
+{detector}
+{\ctikzvalof{bipoles/detector/width}}
+{\ctikzvalof{bipoles/detector/width}}
+{
+    \pgf@circ@res@step = \ctikzvalof{bipoles/detector/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 2
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+
+    \ifpgf@circuit@dashed
+        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \fi
+
+    % draw outer box
+    \pgf@circ@twoportbox
+
+    \ifpgf@circuit@inputarrow
+        {
+            \advance \pgf@circ@res@left by -.5\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
+        }
+    \fi
+
+    % draw inner stuff
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-} %never draw arrows
+    \pgfsetlinewidth{0.8\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0}}
+    \pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@right}{0}}
+    \pgfusepath{draw}
+
+    \ifpgf@circuit@fulldiode
+        \pgfmathparse{2\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/generic/width}}
+        \pgftransformscale{\pgfmathresult}
+        \pgfnode{fulldiodeshape}{center}{}{pgf@fulldiode}{\pgfusepath{fill}}
+    \else
+        \pgfmathparse{2\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/resistor/width}}
+        \pgftransformscale{\pgfmathresult}
+        \pgfnode{emptydiodeshape}{center}{}{pgf@emptydiode}{\pgfusepath{fill}}
+    \fi
+
 }
 
 
@@ -3061,24 +4284,30 @@
 
 %% european gas filled surge arrester
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/european gas filled surge arrester/height}}{european gas filled surge arrester}{\ctikzvalof{bipoles/european gas filled surge arrester/height}}{\ctikzvalof{bipoles/european gas filled surge arrester/width}}{
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/european gas filled surge arrester/height}}
+{european gas filled surge arrester}
+{\ctikzvalof{bipoles/european gas filled surge arrester/height}}
+{\ctikzvalof{bipoles/european gas filled surge arrester/width}}
+{
+
+    %\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
+    %\divide \pgf@circ@res@step by 14
+
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
-		%\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		%\divide \pgf@circ@res@step by 14
+    \pgf@circ@draworfill
 
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw} 
-		
-		\pgfscope
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/european gas filled surge arrester/inside}\pgf@circ@res@left}{0pt}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
-				\pgfusepath{draw} 
-	
-		\endpgfscope
+    \pgfscope
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/european gas filled surge arrester/inside}\pgf@circ@res@left}{0pt}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfusepath{draw}
+
+    \endpgfscope
 }
 
 
@@ -3086,57 +4315,42 @@
 
 %% american gas filled surge arrester
 
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/american gas filled surge arrester/height}}{american gas filled surge arrester}{\ctikzvalof{bipoles/american gas filled surge arrester/height}}{\ctikzvalof{bipoles/american gas filled surge arrester/width}}{
-	%\def\pgf@circ@temp{right}
-	%\ifx\tikz@res@label@pos\pgf@circ@temp
-	%	\pgf@circ@res@step=-1.2\pgf@circ@res@up
-	%\else
-%		\def\pgf@circ@temp{below}
-%		\ifx\tikz@res@label@pos\pgf@circ@temp
-%			\pgf@circ@res@step=-1.2\pgf@circ@res@up
-%		\else
-%			\pgf@circ@res@step=1.2\pgf@circ@res@up
-%		\fi
-%	\fi
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}		
-	\pgfpointorigin	\pgf@circ@res@other =  \pgf@x  \advance \pgf@circ@res@other by -\pgf@circ@res@up
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/american gas filled surge arrester/height}}
+{american gas filled surge arrester}
+{\ctikzvalof{bipoles/american gas filled surge arrester/height}}
+{\ctikzvalof{bipoles/american gas filled surge arrester/width}}{
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpointorigin	\pgf@circ@res@other =  \pgf@x  \advance \pgf@circ@res@other by -\pgf@circ@res@up
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathcircle{\pgfpointorigin}{.9\pgf@circ@res@up}
+        \pgf@circ@draworfill
+    \endpgfscope
 
-		\pgfscope
-			\pgfpathcircle{\pgfpointorigin}{.9\pgf@circ@res@up}
-			\pgfusepath{draw}		
-		\endpgfscope	
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+    \pgfusepath{draw}
 
-	\pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfscope
+        \pgfsetarrowsend{latex}
 
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/inside}\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfusepath{draw}
 
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfusepath{draw}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/inside}\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfusepath{draw}
+    \endpgfscope{}
 
-	\pgfnode{circle}{center}{}{}{}
-	
-	\pgfscope
-		\pgfsetarrowsend{latex}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/inside}\pgf@circ@res@right}{\pgf@circ@res@zero}}
-		\pgfusepath{draw}	
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/inside}\pgf@circ@res@left}{\pgf@circ@res@zero}}
-		\pgfusepath{draw}	
-	\endpgfscope{}
-	
-	%\pgftransformshift{\pgfpoint{.25\pgf@circ@res@left}{.45\pgf@circ@res@down}}
-	%\pgfnode{circ}{center}{}{}{}
-	%\pgftransformshift{}
-	\pgfcircle{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/dot x}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/dot y}\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/size}\pgf@circ@res@down}
-	\pgfusepath{fill}
+    \pgfcircle{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/dot x}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/dot y}\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/bipoles/american gas filled surge arrester/size}\pgf@circ@res@down}
+    \pgfusepath{fill}
 }
 
 % % MECHANICAL SYMBOLS
@@ -3149,13 +4363,13 @@
 
 	\pgfmathsetlength{\pgf@circ@res@step}
 	{(\ctikzvalof{bipoles/spring/width}*\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*.5*\pgflinewidth)/16}
-	
+
 	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
 	\pgfsetcornersarced{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
 	\pgf@circ@res@other = \pgf@circ@res@left
 	\advance\pgf@circ@res@other by \pgf@circ@res@step
 	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\advance\pgf@circ@res@other by 2\pgf@circ@res@step 
+	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
 	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
 	\advance\pgf@circ@res@other by 2\pgf@circ@res@step
 	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
@@ -3177,44 +4391,581 @@
 }
 
 %% mechanical inductance - mass
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/mass/box height}}{mass}{\ctikzvalof{bipoles/mass/height}}{\ctikzvalof{bipoles/mass/width}}{
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgftransformationadjustments
-	\pgfpathrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{-2\pgf@circ@res@down}{-2\pgf@circ@res@down}}
-
-\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfsetrectcap
-	\pgfsetmiterjoin
-	\pgfusepath{stroke}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/mass/box height}}
+{mass}
+{\ctikzvalof{bipoles/mass/height}}
+{\ctikzvalof{bipoles/mass/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \pgfpathrectangle{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+        {\pgfpoint{-2\pgf@circ@res@down}{-2\pgf@circ@res@down}}
+    \pgf@circ@draworfill
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfsetrectcap
+    \pgfsetmiterjoin
+    \pgfusepath{stroke}
 }
 
 %% mechanical resistor - damper
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/damper/height}}{damper}{\ctikzvalof{bipoles/damper/height}}{\ctikzvalof{bipoles/damper/width}}{
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
-					{\pgf@circ@res@zero}}
-	\pgfusepath{stroke}
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/damper/height}}
+{damper}
+{\ctikzvalof{bipoles/damper/height}}
+{\ctikzvalof{bipoles/damper/width}}
+{
+    \pgfpathrectanglecorners{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgf@circ@maybefill
+
+    % line into the damper
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+    \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {\pgf@circ@res@zero}}
+    \pgfusepath{stroke}
+
+    % damper box
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+
+    \pgfsetrectcap
+    \pgfsetmiterjoin
+    \pgfusepath{stroke}
+
+    % damper vertical element
+    \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@up}}
+    \pgfsetbuttcap
+    \pgfusepath{stroke}
 
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+}
+%% mechanical viscoelastic element, suggested by @alex
+%% in https://tex.stackexchange.com/questions/484268/combined-spring-damper-in-circuitikz
+\pgfcircdeclarebipole
+{}                                   % extra anchors
+{\ctikzvalof{bipoles/damper/height}} % depth (under the path line)
+{viscoe}                             % name
+{\ctikzvalof{bipoles/damper/height}} % height (above the path line)
+{\ctikzvalof{bipoles/damper/width}}  % width
+{ % draw the bipole
+    \pgfpathrectanglecorners{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgf@circ@maybefill
+
+    % spring into the damper
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfsetcornersarced{\pgfpoint{.25\pgf@circ@res@up}{.25\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.75\pgf@circ@res@left}{.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.5\pgf@circ@res@left}{-.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{-.75\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}{.75\pgf@circ@res@up}}
+        \pgfusepath{stroke}
+    \endpgfscope
+    % damper box
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+
+    \pgfsetrectcap
+    \pgfsetmiterjoin
+    \pgfusepath{stroke}
+
+    % damper vertical element
+    \pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
+        {.8\pgf@circ@res@up}}
+    \pgfsetbuttcap
+    \pgfusepath{stroke}
 
-	\pgfsetrectcap
-	\pgfsetmiterjoin
-	\pgfusepath{stroke}
-	
-	\pgfpathmoveto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
-						{.8\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\ctikzvalof{bipoles/damper/length}\pgf@circ@res@right}
-						{.8\pgf@circ@res@up}}
-	\pgfsetbuttcap
-	\pgfusepath{stroke}
-	
 }
 
 
+\pgfcircdeclarebipole
+{% anchor for labelling the type of dependency
+    \anchor{label}{%
+        \southwest
+        \pgf@x=0.4\pgf@x
+    }%
+}
+{\ctikzvalof{bipoles/resistivesens/height}}
+{resistivesens}
+{\ctikzvalof{bipoles/resistivesens/height}}
+{\ctikzvalof{bipoles/resistivesens/width}}
+{%
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+    \divide \pgf@circ@res@step by 12
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfsetbeveljoin
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-.9\pgf@circ@res@other}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+%% crossing bipole (but see also nodes)
+\pgfcircdeclarebipole
+    {}
+    {\ctikzvalof{bipoles/crossing/size}}
+    {crossing}
+    {\ctikzvalof{bipoles/crossing/size}}
+    {\ctikzvalof{bipoles/crossing/size}}{
+        \pgfscope
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpatharc{0}{-180}{0.4*\pgf@circ@res@left}
+        \pgfsetbeveljoin
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfusepath{draw}
+        \endpgfscope
+    }
+
+%% loudspeaker and microphone
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/loudspeaker/depth}}
+{loudspeaker}
+{\ctikzvalof{bipoles/loudspeaker/height}}
+{\ctikzvalof{bipoles/loudspeaker/width}}{
+
+    \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{.4\pgf@circ@res@up}}
+    {\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@left}{.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.8\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.8\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{.4\pgf@circ@res@up}}
+    \pgfpathclose
+    \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+    \pgf@circ@draworfill
+}
+
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/mic/depth}}
+{mic}
+{\ctikzvalof{bipoles/mic/height}}
+{\ctikzvalof{bipoles/mic/width}}{
+
+    \pgfscope
+    \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathcircle{\pgfpoint{0pt}{.6\pgf@circ@res@up}}{.4\pgf@circ@res@up}
+    \pgf@circ@draworfill
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \endpgfscope
+    \pgfscope
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{-.2\pgf@circ@res@up}{0pt}}
+    % 0.25358 is 0.6-0.4*cos(30)
+    \pgfpathlineto{\pgfpoint{-.2\pgf@circ@res@up}{.25358\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@up}{.25358\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@up}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfusepath{draw}
+
+    \pgfusepath{draw}
+    \endpgfscope
+}
+
+% generic round meter with always horizontal text, no arrow
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/esource/height}}
+{rmeter}
+{\ctikzvalof{bipoles/esource/height}}
+{\ctikzvalof{bipoles/esource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    % draw the text label
+    % get the rotation
+    \pgfgettransformentries\a\b\temp\temp\temp\temp
+    \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+    % and unrotate the scope
+    \pgfscope
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgftransformrotate{\rot}
+        \pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
+    \endpgfscope
+}
+
+% generic round meter with always horizontal text, with arrow
+\pgfcircdeclarebipole
+{}
+{\ctikzvalof{bipoles/esource/height}}
+{rmeterwa}
+{\ctikzvalof{bipoles/esource/height}}
+{\ctikzvalof{bipoles/esource/width}}
+{
+    \pgfpointorigin
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
+    \pgf@circ@draworfill
+    % draw the text label
+    % get the rotation
+    \pgfgettransformentries\a\b\temp\temp\temp\temp
+    \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+    % and unrotate the scope
+    \pgfscope
+        \pgftransformrotate{\rot}
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        % arrow: create  a center hole to have better visual
+        \pgfscope
+            % clipping path: first a rectangle bigger then the shape
+            % to avoid problems with the line thickness
+            \pgfpathrectanglecorners{\pgfpoint{2\pgf@circ@res@left}{2\pgf@circ@res@down}}
+            {\pgfpoint{2\pgf@circ@res@right}{2\pgf@circ@res@up}}
+            % next open a circle into it
+            \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{.6\pgf@circ@res@up}}{\pgfpoint{.6\pgf@circ@res@left}{0}}
+            % do the difference and clip before drawing
+            \pgfseteorule
+            \pgfusepath{clip}
+            \pgfsetarrowsend{latexslim}
+            % the arrow is better if it has a bit of breath and it's not 45º
+            \pgfpathmoveto{\pgfpoint{.8\pgf@circ@res@left}{1.2\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{.8\pgf@circ@res@right}{1.2\pgf@circ@res@up}}
+            \pgfusepath{draw}
+        \endpgfscope
+        \pgftext[center]{\ctikzvalof{bipoles/twoport/text}}
+    \endpgfscope
+}
+
+% generic square meter with always horizontal text
+\pgfcircdeclarebipole
+{
+    \anchor{in 1}{\southwest\pgf@y=0.75\pgf@y\pgf@x=0.4\pgf@x}
+    \anchor{in 2}{\southwest\pgf@y=0.75\pgf@y\pgf@x=-0.4\pgf@x}
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+}
+{\ctikzvalof{bipoles/smeter/height}}
+{smeter}
+{\ctikzvalof{bipoles/smeter/height}}
+{\ctikzvalof{bipoles/smeter/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgfextracty{\pgf@circ@res@up}{\northeast}
+    \pgfextractx{\pgf@circ@res@right}{\northeast}
+    \pgfextractx{\pgf@circ@res@left}{\southwest}
+    \pgfextracty{\pgf@circ@res@down}{\southwest}
+    \pgfmathsetlength{\pgf@circ@res@step}{0.25*\pgf@circ@res@up}
+    \pgfscope
+        \pgfsetcornersarced{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@step}}
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgf@circ@draworfill
+    \endpgfscope
+    % get the rotation
+    \pgfgettransformentries\a\b\temp\temp\temp\temp
+    \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+    % and unrotate the scope
+    \pgfscope
+        \pgftransformrotate{\rot}
+        % the metering window
+        \pgfscope
+            \def\@starta{105}\def\@stopa{75}
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \pgftransformshift{\pgfpoint{0pt}{-1.8\pgf@circ@res@up}}
+            \pgfpathmoveto{\pgfpointpolar{\@starta}{2\pgf@circ@res@up}}
+            \pgfpatharc{\@starta}{\@stopa}{2\pgf@circ@res@up}
+            \pgfpathlineto{\pgfpointpolar{\@stopa}{2.5\pgf@circ@res@up}}
+            \pgfpatharc{\@stopa}{\@starta}{2.5\pgf@circ@res@up}
+            \pgfclosepath
+            \pgfpathmoveto{\pgfpointpolar{80}{2\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpointpolar{80}{2.4\pgf@circ@res@up}}
+            \pgfusepath{draw}
+        \endpgfscope
+        \pgftext[center, y=0.5\pgf@circ@res@down]{\ctikzvalof{bipoles/twoport/text}}
+    \endpgfscope
+}
+
+% probles qucs style:
+% #1 : name
+% #2 : extra code
+\long\def\pgfcirc@qucsprobe#1#2{
+    \pgfcircdeclarebipole
+    {
+        \anchor{v+}{\southwest\pgf@x=0.6\pgf@x}
+        \anchor{v-}{\southwest\pgf@x=-0.6\pgf@x}
+        % put the node text above and centered
+        \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northeast}
+            \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+                \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+            }
+        }
+    }
+    {\ctikzvalof{bipoles/qmeter/depth}}
+    {#1}
+    {\ctikzvalof{bipoles/qmeter/height}}
+    {\ctikzvalof{bipoles/qmeter/width}}
+    {
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfextractx{\pgf@circ@res@right}{\northeast}
+        \pgfextractx{\pgf@circ@res@left}{\southwest}
+        \pgfextracty{\pgf@circ@res@down}{\southwest}
+        \pgfmathsetlength{\pgf@circ@res@step}{0.25*\pgf@circ@res@up}
+        \pgfscope
+            \pgfscope
+                \pgfsetcornersarced{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@step}}
+                \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+            \pgf@circ@draworfill
+            \endpgfscope
+            \def\@starta{103}\def\@stopa{77}
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \pgfscope
+                \pgftransformshift{\pgfpoint{0pt}{-1.7\pgf@circ@res@up}}
+                \pgfpathmoveto{\pgfpointpolar{\@starta}{2.1\pgf@circ@res@up}}
+                \pgfpatharc{\@starta}{\@stopa}{2.1\pgf@circ@res@up}
+                \pgfpathlineto{\pgfpointpolar{\@stopa}{2.5\pgf@circ@res@up}}
+                \pgfpatharc{\@stopa}{\@starta}{2.5\pgf@circ@res@up}
+                \pgfclosepath
+                \pgfpathmoveto{\pgfpointpolar{83}{2.1\pgf@circ@res@up}}
+                \pgfpathlineto{\pgfpointpolar{83}{2.4\pgf@circ@res@up}}
+                \pgfusepath{draw}
+                \pgf@circ@draworfill
+            \endpgfscope
+            #2
+        \endpgfscope
+    }
+}
+
+\pgfcirc@qucsprobe{qiprobe}{
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfusepath{draw}
+    \pgfnode{currarrow}{center}{}{}{}
+}
+
+\pgfcirc@qucsprobe{qvprobe}{
+    \pgfmathsetlength{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left}{0pt}}
+    \pgfpathcircle{\pgfpoint{.6\pgf@circ@res@left+\pgf@circ@res@other}{0pt}}{\pgf@circ@res@other}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathcircle{\pgfpoint{.6\pgf@circ@res@right-\pgf@circ@res@other}{0pt}}{\pgf@circ@res@other}
+    \pgfusepath{draw}
+    \pgfscope
+        % "+" and "-", drawn so that they scale correctly
+        \pgfsetlinewidth{2\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left+\pgf@circ@res@other}{-1.5\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left+\pgf@circ@res@other}{-3.5\pgf@circ@res@other}}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left+0\pgf@circ@res@other}{-2.5\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left+2\pgf@circ@res@other}{-2.5\pgf@circ@res@other}}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@right+0\pgf@circ@res@other}{-2.5\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right-2\pgf@circ@res@other}{-2.5\pgf@circ@res@other}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+\pgfcirc@qucsprobe{qpprobe}{
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfusepath{draw}
+    \pgfnode{currarrow}{center}{}{}{}
+    \pgfmathsetlength{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+    \pgfpathcircle{\pgfpoint{.6\pgf@circ@res@left}{-3\pgf@circ@res@other}}{\pgf@circ@res@other}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{-4\pgf@circ@res@other}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathcircle{\pgfpoint{.6\pgf@circ@res@right}{-3\pgf@circ@res@other}}{\pgf@circ@res@other}
+    \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@right}{-4\pgf@circ@res@other}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+    \pgfscope
+        % "+" and "-", drawn so that they scale correctly
+        \pgfsetlinewidth{2\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left+3\pgf@circ@res@other}{-2\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left+3\pgf@circ@res@other}{-4\pgf@circ@res@other}}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left+2\pgf@circ@res@other}{-3\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@left+4\pgf@circ@res@other}{-3\pgf@circ@res@other}}
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@right-4\pgf@circ@res@other}{-3\pgf@circ@res@other}}
+        \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right-2\pgf@circ@res@other}{-3\pgf@circ@res@other}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+
+% current loop for oscope and similar: stylized
+
+\pgfcircdeclarebipole
+{
+    \anchor{i}{\northeast\pgf@x=0pt\relax}
+    \anchor{text}{
+        \pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfextractx{\pgf@circ@res@left}{\northeast}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox+\pgf@circ@res@left}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+}
+{\ctikzvalof{bipoles/iloop/height}}
+{iloop}
+{\ctikzvalof{bipoles/iloop/height}}
+{\ctikzvalof{bipoles/iloop/width}}
+{
+    \pgfextracty{\pgf@circ@res@up}{\northeast}
+    \pgfextractx{\pgf@circ@res@right}{\northeast}
+    \pgf@circ@res@down=-\pgf@circ@res@up
+    \pgf@circ@res@left=-\pgf@circ@res@right
+    \pgfscope
+        \pgfstartlinewidth=\pgflinewidth
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        % external ellipse
+        \pgfscope
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgflinewidth}
+            % clipping path: first a rectangle bigger then the shape
+            % to avoid problems with the line thickness
+            \pgfpathrectanglecorners{\pgfpoint{2\pgf@circ@res@left}{2\pgf@circ@res@down}}
+            {\pgfpoint{2\pgf@circ@res@right}{2\pgf@circ@res@up}}
+            % next the opening to the left
+            \pgfpathrectanglecorners{\pgfpoint{2\pgf@circ@res@left}{.1\pgf@circ@res@down}}
+            {\pgfpoint{0pt}{.1\pgf@circ@res@up}}
+            % do the difference and clip before drawing
+            \pgfseteorule
+            \pgfusepath{clip}
+            \pgfpathellipse{\pgfpointorigin}{
+                \pgfpoint{0pt}{0.8\pgf@circ@res@up}}{
+            \pgfpoint{0.4\pgf@circ@res@right}{0pt}}
+            \pgfusepath{draw}
+        \endpgfscope
+        % internal wire
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@right}{0pt}}
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        % and the contact line up
+        \pgfpathmoveto{\pgfpoint{0pt}{0.8\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+
+% current loop for oscope and similar: real (double connection)
+
+\pgfcircdeclarebipole
+{
+    \anchor{i+}{
+        \pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfextractx{\pgf@circ@res@right}{\northeast}
+        \pgf@circ@res@step=0.4\pgf@circ@res@right
+        \pgf@circ@res@other=0.8\pgf@circ@res@up
+        \pgfpointpolar{105}{\pgf@circ@res@step and \pgf@circ@res@other}
+        \pgf@y=\pgf@circ@res@up
+    }
+    \anchor{i-}{
+        \pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfextractx{\pgf@circ@res@right}{\northeast}
+        \pgf@circ@res@step=0.4\pgf@circ@res@right
+        \pgf@circ@res@other=0.8\pgf@circ@res@up
+        \pgfpointpolar{75}{\pgf@circ@res@step and \pgf@circ@res@other}
+        \pgf@y=\pgf@circ@res@up
+    }
+    \anchor{text}{
+        \pgfextracty{\pgf@circ@res@up}{\northeast}
+        \pgfextractx{\pgf@circ@res@left}{\northeast}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox+\pgf@circ@res@left}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+}
+{\ctikzvalof{bipoles/iloop/height}}
+{iloop2}
+{\ctikzvalof{bipoles/iloop/height}}
+{\ctikzvalof{bipoles/iloop/width}}
+{
+    \pgfextracty{\pgf@circ@res@up}{\northeast}
+    \pgfextractx{\pgf@circ@res@right}{\northeast}
+    \pgf@circ@res@down=-\pgf@circ@res@up
+    \pgf@circ@res@left=-\pgf@circ@res@right
+    % must be the same than internal i+ and i- anchors definition
+    \pgf@circ@res@step=0.4\pgf@circ@res@right
+    \pgf@circ@res@other=0.8\pgf@circ@res@up
+    \def\@plus{\pgfpointpolar{105}{\pgf@circ@res@step and \pgf@circ@res@other}}
+    \def\@minus{\pgfpointpolar{75}{\pgf@circ@res@step and \pgf@circ@res@other}}
+    \pgfscope
+        \pgfstartlinewidth=\pgflinewidth
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        % external ellipse
+        \pgfscope
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgflinewidth}
+            % clipping path: first a rectangle bigger then the shape
+            % to avoid problems with the line thickness
+            \pgfpathrectanglecorners{\pgfpoint{2\pgf@circ@res@left}{2\pgf@circ@res@down}}
+            {\pgfpoint{2\pgf@circ@res@right}{2\pgf@circ@res@up}}
+            % next the opening to the left
+            \pgfpathrectanglecorners{\pgfpoint{2\pgf@circ@res@left}{.1\pgf@circ@res@down}}
+            {\pgfpoint{0pt}{.1\pgf@circ@res@up}}
+            % do the difference and clip before drawing
+            \pgfseteorule
+            \pgfusepath{clip}
+            \pgfpathmoveto{\@plus}
+            \pgfpatharc{105}{435}{\pgf@circ@res@step and \pgf@circ@res@other}
+            \pgfusepath{draw}
+        \endpgfscope
+        % internal wire
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@right}{0pt}}
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        % and the contact line up
+        % I use ...left and ---right as temporal lengths here to avoid defining more
+        \pgfextractx{\pgf@circ@res@left}{\@plus}
+        \pgfextractx{\pgf@circ@res@right}{\@minus}
+        \pgfpathmoveto{\@plus}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+        \pgfpathmoveto{\@minus}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+% end of pgfcircbipoles.tex
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
index 34497df885c..88cd79aa5b8 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
@@ -5,195 +5,194 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Current handling
 
 %% Options
 \ctikzset{i^>/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = forward,
-		\circuitikzbasekey/bipole/current/x position = after,
-		\circuitikzbasekey/bipole/current/y position = above
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = forward,
+        \circuitikzbasekey/bipole/current/x position = after,
+        \circuitikzbasekey/bipole/current/y position = above
+    }
 }
 
 \ctikzset{i_>/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = forward,
-		\circuitikzbasekey/bipole/current/x position = after,
-		\circuitikzbasekey/bipole/current/y position = below
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = forward,
+        \circuitikzbasekey/bipole/current/x position = after,
+        \circuitikzbasekey/bipole/current/y position = below
+    }
 }
 
 \ctikzset{i>^/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = forward,
-		\circuitikzbasekey/bipole/current/x position = before,
-		\circuitikzbasekey/bipole/current/y position = above
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = forward,
+        \circuitikzbasekey/bipole/current/x position = before,
+        \circuitikzbasekey/bipole/current/y position = above
+    }
 }
 
 \ctikzset{i>_/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = forward,
-		\circuitikzbasekey/bipole/current/x position = before,
-		\circuitikzbasekey/bipole/current/y position = below
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = forward,
+        \circuitikzbasekey/bipole/current/x position = before,
+        \circuitikzbasekey/bipole/current/y position = below
+    }
 }
 
 \ctikzset{i^</.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = backward,
-		\circuitikzbasekey/bipole/current/x position = after,
-		\circuitikzbasekey/bipole/current/y position = above
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = backward,
+        \circuitikzbasekey/bipole/current/x position = after,
+        \circuitikzbasekey/bipole/current/y position = above
+    }
 }
 
 \ctikzset{i_</.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = backward,
-		\circuitikzbasekey/bipole/current/x position = after,
-		\circuitikzbasekey/bipole/current/y position = below
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = backward,
+        \circuitikzbasekey/bipole/current/x position = after,
+        \circuitikzbasekey/bipole/current/y position = below
+    }
 }
 
 \ctikzset{i<^/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = backward,
-		\circuitikzbasekey/bipole/current/x position = before,
-		\circuitikzbasekey/bipole/current/y position = above
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = backward,
+        \circuitikzbasekey/bipole/current/x position = before,
+        \circuitikzbasekey/bipole/current/y position = above
+    }
 }
 
 \ctikzset{i<_/.style = {
-		i = #1,
-		\circuitikzbasekey/bipole/current/direction = backward,
-		\circuitikzbasekey/bipole/current/x position = before,
-		\circuitikzbasekey/bipole/current/y position = below
-	}
+        i = #1,
+        \circuitikzbasekey/bipole/current/direction = backward,
+        \circuitikzbasekey/bipole/current/x position = before,
+        \circuitikzbasekey/bipole/current/y position = below
+    }
 }
 
 \ctikzset{i/.code = {
-	\pgfkeys{\circuitikzbasekey/bipole/current/direction = forward,
-					\circuitikzbasekey/bipole/current/x position = after,
-					\circuitikzbasekey/bipole/current/y position = above }
-	\pgfkeys{/tikz/circuitikz/bipole/current/label/name=#1}
-	\ctikzsetvalof{bipole/current/label/unit}{}
-	\ifpgf@circ@siunitx 
-		\pgf@circ@handleSI{#1}
-		\ifpgf@circ@siunitx@res 
-			\edef\pgf@temp{\pgf@circ@handleSI@val}
-			\pgfkeyslet{/tikz/circuitikz/bipole/current/label/name}{\pgf@temp}
-			\edef\pgf@temp{\pgf@circ@handleSI@unit}
-			\pgfkeyslet{/tikz/circuitikz/bipole/current/label/unit}{\pgf@temp}
-		\else
-		\fi
-	\else
-	\fi
-%reverse current direction for voltage sources
-	\ifpgf@circ@oldvoltagedirection\else
-		\ifpgf@circuit@bipole@isvoltage
-		\ifpgf@circuit@bipole@voltage@backward
-			\pgfkeys{\circuitikzbasekey/bipole/current/direction = forward,
-					\circuitikzbasekey/bipole/current/x position = after,
-					\circuitikzbasekey/bipole/current/y position = below }
-		\else
-			\pgfkeys{\circuitikzbasekey/bipole/current/direction = backward,
-					\circuitikzbasekey/bipole/current/x position = before,
-					\circuitikzbasekey/bipole/current/y position = above }
-	\fi\fi\fi
+        \pgfkeys{\circuitikzbasekey/bipole/current/direction = forward,
+            \circuitikzbasekey/bipole/current/x position = after,
+        \circuitikzbasekey/bipole/current/y position = above }
+        \pgfkeys{/tikz/circuitikz/bipole/current/label/name=#1}
+        \ctikzsetvalof{bipole/current/label/unit}{}
+        \ifpgf@circ@siunitx
+            \pgf@circ@handleSI{#1}
+            \ifpgf@circ@siunitx@res
+                \edef\pgf@temp{\pgf@circ@handleSI@val}
+                \pgfkeyslet{/tikz/circuitikz/bipole/current/label/name}{\pgf@temp}
+                \edef\pgf@temp{\pgf@circ@handleSI@unit}
+                \pgfkeyslet{/tikz/circuitikz/bipole/current/label/unit}{\pgf@temp}
+            \else
+        \fi
+        \else
+    \fi
+    %reverse current direction for voltage sources
+    \ifpgf@circ@oldvoltagedirection\else
+        \ifpgf@circuit@bipole@isvoltage
+            \ifpgf@circuit@bipole@voltage@backward
+                \pgfkeys{\circuitikzbasekey/bipole/current/direction = forward,
+                    \circuitikzbasekey/bipole/current/x position = after,
+                \circuitikzbasekey/bipole/current/y position = below }
+            \else
+                \pgfkeys{\circuitikzbasekey/bipole/current/direction = backward,
+                    \circuitikzbasekey/bipole/current/x position = before,
+                \circuitikzbasekey/bipole/current/y position = above }
+            \fi\fi\fi
+    }
 }
-}
-
 
 \ifpgf@circ@oldvoltagedirection
-	\ctikzset{i</.style = { i = #1, \circuitikzbasekey/bipole/current/direction = backward } }
+    \ctikzset{i</.style = { i = #1, \circuitikzbasekey/bipole/current/direction = backward } }
 \else
-	\ctikzset{i</.style = { i = #1, \circuitikzbasekey/bipole/current/direction = backward, \circuitikzbasekey/bipole/current/x position = before } }
+    \ctikzset{i</.style = { i = #1, \circuitikzbasekey/bipole/current/direction = backward, \circuitikzbasekey/bipole/current/x position = before } }
 \fi
 \ctikzset{i_/.style = { i = #1, \circuitikzbasekey/bipole/current/y position = below } }
 \ctikzset{i>/.style = {i = #1, \circuitikzbasekey/bipole/current/direction = forward } }
 \ctikzset{i^/.style = { i= #1, \circuitikzbasekey/bipole/current/y position = above } }
 
-%% Output routine 
+%% Output routine
 \def\pgf@circ@drawcurrent{
-	\pgfextra{
-		\edef\pgf@circ@ffffff{\pgf@circ@direction}
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@ffffff\pgf@nil}
-
-		\ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
-			\ifpgf@circuit@bipole@current@below
-				\def\pgf@circ@dir{north west} \else \def\pgf@circ@dir{south east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
-			\ifpgf@circuit@bipole@current@below
-				\def\pgf@circ@dir{west} \else \def\pgf@circ@dir{east} 
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
-			\ifpgf@circuit@bipole@current@below
-				 \def\pgf@circ@dir{south west}\else \def\pgf@circ@dir{north east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
-			\ifpgf@circuit@bipole@current@below
-				  \def\pgf@circ@dir{south}\else\def\pgf@circ@dir{north}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
-			\ifpgf@circuit@bipole@current@below
-				 \def\pgf@circ@dir{south east}\else\def\pgf@circ@dir{north west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
-			\ifpgf@circuit@bipole@current@below
-				 \def\pgf@circ@dir{east}\else \def\pgf@circ@dir{west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
-			\ifpgf@circuit@bipole@current@below
-				  \def\pgf@circ@dir{north east}\else\def\pgf@circ@dir{south west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult <5
-			\ifpgf@circuit@bipole@current@below
-				 \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south} 
-			\fi
-		\fi
-		\ifnum\pgfcircmathresult >355
-			\ifpgf@circuit@bipole@current@below
-				 \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south} 
-			\fi
-		\fi
-		
-		\ifpgf@circuit@bipole@current@below
-			\def\pgf@circ@bipole@current@label@where{-90}
-		\else
-			\def\pgf@circ@bipole@current@label@where{+90}
-		\fi
-	}
-	
-	\pgfextra{\def\pgf@temp{short}\edef\pgf@circ@temp{\ctikzvalof{bipole/kind}}}
-		\ifx\pgf@circ@temp\pgf@temp%draw current at a short at middle of the line
-				(\tikztostart)--(\tikztotarget)
-		\else% normal bipole or source
-			\ifpgf@circuit@bipole@current@before
-				 (\tikztostart)--(anchorstartnode)
-			\else
-				(anchorendnode)--(\tikztotarget)
-			\fi
-		\fi
-		\ifpgf@circuit@bipole@current@backward
-			\pgfextra{
-				\pgfmathsubtract{\pgf@circ@ffffff}{180}
-				\edef\pgf@circ@ffffff{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-				}
-		\fi
-	coordinate[currarrow,pos=\ctikzvalof{current/distance},rotate=\pgf@circ@ffffff](Iarrow)
-	(Iarrow.\pgf@circ@bipole@current@label@where) node[anchor=\pgf@circ@dir]{\pgf@circ@finallabels{current/label}}
+    \pgfextra{
+        \edef\pgf@circ@ffffff{\pgf@circ@direction}
+        \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@ffffff\pgf@nil}
+
+        \ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{north west} \else \def\pgf@circ@dir{south east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{west} \else \def\pgf@circ@dir{east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{south west}\else \def\pgf@circ@dir{north east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{south}\else\def\pgf@circ@dir{north}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{south east}\else\def\pgf@circ@dir{north west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{east}\else \def\pgf@circ@dir{west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{north east}\else\def\pgf@circ@dir{south west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult <5
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south}
+        \fi
+        \fi
+        \ifnum\pgfcircmathresult >355
+        \ifpgf@circuit@bipole@current@below
+            \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south}
+        \fi
+    \fi
+
+    \ifpgf@circuit@bipole@current@below
+        \def\pgf@circ@bipole@current@label@where{-90}
+    \else
+        \def\pgf@circ@bipole@current@label@where{+90}
+    \fi
+    }
+
+    \pgfextra{\def\pgf@temp{short}\edef\pgf@circ@temp{\ctikzvalof{bipole/kind}}}
+    \ifx\pgf@circ@temp\pgf@temp%draw current at a short at middle of the line
+        (\tikztostart)--(\tikztotarget)
+    \else% normal bipole or source
+        \ifpgf@circuit@bipole@current@before
+            (\tikztostart)--(anchorstartnode)
+        \else
+            (anchorendnode)--(\tikztotarget)
+        \fi
+    \fi
+    \ifpgf@circuit@bipole@current@backward
+        \pgfextra{
+            \pgfmathsubtract{\pgf@circ@ffffff}{180}
+            \edef\pgf@circ@ffffff{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+        }
+    \fi
+    coordinate[currarrow,pos=\ctikzvalof{current/distance},rotate=\pgf@circ@ffffff](Iarrow)
+    (Iarrow.\pgf@circ@bipole@current@label@where) node[anchor=\pgf@circ@dir]{\pgf@circ@finallabels{current/label}}
 }
 
-\endinput
\ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex
index 217e482757a..7995725d6d6 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex
@@ -5,74 +5,74 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% flow handling
 
 %% Options
 \ctikzset{f^>/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = forward,
-		\circuitikzbasekey/bipole/flow/x position = after,
-		\circuitikzbasekey/bipole/curflowrent/y position = above
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = forward,
+        \circuitikzbasekey/bipole/flow/x position = after,
+        \circuitikzbasekey/bipole/curflowrent/y position = above
+    }
 }
 
 \ctikzset{f_>/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = forward,
-		\circuitikzbasekey/bipole/flow/x position = after,
-		\circuitikzbasekey/bipole/flow/y position = below
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = forward,
+        \circuitikzbasekey/bipole/flow/x position = after,
+        \circuitikzbasekey/bipole/flow/y position = below
+    }
 }
 
 \ctikzset{f>^/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = forward,
-		\circuitikzbasekey/bipole/flow/x position = before,
-		\circuitikzbasekey/bipole/flow/y position = above
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = forward,
+        \circuitikzbasekey/bipole/flow/x position = before,
+        \circuitikzbasekey/bipole/flow/y position = above
+    }
 }
 
 \ctikzset{f>_/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = forward,
-		\circuitikzbasekey/bipole/flow/x position = before,
-		\circuitikzbasekey/bipole/flow/y position = below
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = forward,
+        \circuitikzbasekey/bipole/flow/x position = before,
+        \circuitikzbasekey/bipole/flow/y position = below
+    }
 }
 
 \ctikzset{f^</.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = backward,
-		\circuitikzbasekey/bipole/flow/x position = after,
-		\circuitikzbasekey/bipole/flow/y position = above
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = backward,
+        \circuitikzbasekey/bipole/flow/x position = after,
+        \circuitikzbasekey/bipole/flow/y position = above
+    }
 }
 
 \ctikzset{f_</.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = backward,
-		\circuitikzbasekey/bipole/flow/x position = after,
-		\circuitikzbasekey/bipole/flow/y position = below
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = backward,
+        \circuitikzbasekey/bipole/flow/x position = after,
+        \circuitikzbasekey/bipole/flow/y position = below
+    }
 }
 
 \ctikzset{f<^/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = backward,
-		\circuitikzbasekey/bipole/flow/x position = before,
-		\circuitikzbasekey/bipole/flow/y position = above
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = backward,
+        \circuitikzbasekey/bipole/flow/x position = before,
+        \circuitikzbasekey/bipole/flow/y position = above
+    }
 }
 
 \ctikzset{f<_/.style = {
-		f = #1,
-		\circuitikzbasekey/bipole/flow/direction = backward,
-		\circuitikzbasekey/bipole/flow/x position = before,
-		\circuitikzbasekey/bipole/flow/y position = below
-	}
+        f = #1,
+        \circuitikzbasekey/bipole/flow/direction = backward,
+        \circuitikzbasekey/bipole/flow/x position = before,
+        \circuitikzbasekey/bipole/flow/y position = below
+    }
 }
 
 \ctikzset{f</.style = { f = #1, \circuitikzbasekey/bipole/flow/direction = backward} }
@@ -81,113 +81,113 @@
 \ctikzset{f^/.style = { f = #1, \circuitikzbasekey/bipole/flow/y position = above } }
 
 \ctikzset{f/.code = {
-	\pgfkeys{\circuitikzbasekey/bipole/flow/direction = forward,
-					\circuitikzbasekey/bipole/flow/x position = after,
-					\circuitikzbasekey/bipole/flow/y position = above }
-	\pgfkeys{/tikz/circuitikz/bipole/flow/label/name=#1}
-	\ctikzsetvalof{bipole/flow/label/unit}{}
-	\ifpgf@circ@siunitx 
-		\pgf@circ@handleSI{#1}
-		\ifpgf@circ@siunitx@res 
-			\edef\pgf@temp{\pgf@circ@handleSI@val}
-			\pgfkeyslet{/tikz/circuitikz/bipole/flow/label/name}{\pgf@temp}
-			\edef\pgf@temp{\pgf@circ@handleSI@unit}
-			\pgfkeyslet{/tikz/circuitikz/bipole/flow/label/unit}{\pgf@temp}
-		\else
-		\fi
-	\else
-	\fi
+        \pgfkeys{\circuitikzbasekey/bipole/flow/direction = forward,
+            \circuitikzbasekey/bipole/flow/x position = after,
+        \circuitikzbasekey/bipole/flow/y position = above }
+        \pgfkeys{/tikz/circuitikz/bipole/flow/label/name=#1}
+        \ctikzsetvalof{bipole/flow/label/unit}{}
+        \ifpgf@circ@siunitx
+            \pgf@circ@handleSI{#1}
+            \ifpgf@circ@siunitx@res
+                \edef\pgf@temp{\pgf@circ@handleSI@val}
+                \pgfkeyslet{/tikz/circuitikz/bipole/flow/label/name}{\pgf@temp}
+                \edef\pgf@temp{\pgf@circ@handleSI@unit}
+                \pgfkeyslet{/tikz/circuitikz/bipole/flow/label/unit}{\pgf@temp}
+            \else
+        \fi
+        \else
+    \fi
 }
 }
 
-%% Output routine 
+%% Output routine
 \def\pgf@circ@drawflow{
-	\pgfextra{
-		\edef\pgf@circ@ffffff{\pgf@circ@direction}
-		\def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@ffffff\pgf@nil}
-
-		\ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
-			\ifpgf@circuit@bipole@flow@below
-				\def\pgf@circ@dir{north west} \else \def\pgf@circ@dir{south east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
-			\ifpgf@circuit@bipole@flow@below
-				\def\pgf@circ@dir{west} \else \def\pgf@circ@dir{east} 
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
-			\ifpgf@circuit@bipole@flow@below
-				 \def\pgf@circ@dir{south west}\else \def\pgf@circ@dir{north east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
-			\ifpgf@circuit@bipole@flow@below
-				  \def\pgf@circ@dir{south}\else\def\pgf@circ@dir{north}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
-			\ifpgf@circuit@bipole@flow@below
-				 \def\pgf@circ@dir{south east}\else\def\pgf@circ@dir{north west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
-			\ifpgf@circuit@bipole@flow@below
-				 \def\pgf@circ@dir{east}\else \def\pgf@circ@dir{west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
-			\ifpgf@circuit@bipole@flow@below
-				  \def\pgf@circ@dir{north east}\else\def\pgf@circ@dir{south west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult <5
-			\ifpgf@circuit@bipole@flow@below
-				 \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south} 
-			\fi
-		\fi
-		\ifnum\pgfcircmathresult >355
-			\ifpgf@circuit@bipole@flow@below
-				 \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south} 
-			\fi
-		\fi
-		
-		\ifpgf@circuit@bipole@flow@below
-			\def\pgf@circ@bipole@flow@label@where{-90}
-		\else
-			\def\pgf@circ@bipole@flow@label@where{+90}
-		\fi
-	}
-	
-	\pgfextra{\def\pgf@temp{short}\edef\pgf@circ@temp{\ctikzvalof{bipole/kind}}}
-		\ifx\pgf@circ@temp\pgf@temp%draw flow at a short at middle of the line
-				(\tikztostart)--(\tikztotarget)
-		\else% normal bipole or source
-			\ifpgf@circuit@bipole@flow@before
-				 (\tikztostart)--(anchorstartnode)
-			\else
-				(anchorendnode)--(\tikztotarget)
-			\fi
-		\fi
-	\pgfextra{
-		\ifpgf@circuit@bipole@flow@backward
-			\ifpgf@circuit@bipole@flow@below
-				\def\flow@offset{\ctikzvalof{flow/offset}\pgf@circ@Rlen}
-			\else
-				\def\flow@offset{-\ctikzvalof{flow/offset}\pgf@circ@Rlen}
-			\fi
-			\pgfmathsubtract{\pgf@circ@ffffff}{180}
-			\edef\pgf@circ@ffffff{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}	
-		\else
-			\ifpgf@circuit@bipole@flow@below
-				\def\flow@offset{-\ctikzvalof{flow/offset}\pgf@circ@Rlen}
-			\else
-				\def\flow@offset{\ctikzvalof{flow/offset}\pgf@circ@Rlen}
-			\fi
-		\fi
-	}
-	coordinate[flowarrow,pos=\ctikzvalof{flow/distance},rotate=\pgf@circ@ffffff,yshift=\flow@offset](Farrowpos)
-	(Farrowpos.\pgf@circ@bipole@flow@label@where) node[anchor=\pgf@circ@dir]{ \pgf@circ@finallabels{flow/label}}
+    \pgfextra{
+        \edef\pgf@circ@ffffff{\pgf@circ@direction}
+        \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@ffffff\pgf@nil}
+
+        \ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
+                \ifpgf@circuit@bipole@flow@below
+                        \def\pgf@circ@dir{north west} \else \def\pgf@circ@dir{south east}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
+                \ifpgf@circuit@bipole@flow@below
+                        \def\pgf@circ@dir{west} \else \def\pgf@circ@dir{east}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
+                \ifpgf@circuit@bipole@flow@below
+                         \def\pgf@circ@dir{south west}\else \def\pgf@circ@dir{north east}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
+                \ifpgf@circuit@bipole@flow@below
+                          \def\pgf@circ@dir{south}\else\def\pgf@circ@dir{north}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
+                \ifpgf@circuit@bipole@flow@below
+                         \def\pgf@circ@dir{south east}\else\def\pgf@circ@dir{north west}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
+                \ifpgf@circuit@bipole@flow@below
+                         \def\pgf@circ@dir{east}\else \def\pgf@circ@dir{west}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
+                \ifpgf@circuit@bipole@flow@below
+                          \def\pgf@circ@dir{north east}\else\def\pgf@circ@dir{south west}
+                \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult <5
+                \ifpgf@circuit@bipole@flow@below
+                         \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south}
+                \fi
+        \fi
+        \ifnum\pgfcircmathresult >355
+                \ifpgf@circuit@bipole@flow@below
+                         \def\pgf@circ@dir{north}\else\def\pgf@circ@dir{south}
+                \fi
+        \fi
+
+        \ifpgf@circuit@bipole@flow@below
+                \def\pgf@circ@bipole@flow@label@where{-90}
+        \else
+                \def\pgf@circ@bipole@flow@label@where{+90}
+        \fi
+    }
+
+    \pgfextra{\def\pgf@temp{short}\edef\pgf@circ@temp{\ctikzvalof{bipole/kind}}}
+    \ifx\pgf@circ@temp\pgf@temp%draw flow at a short at middle of the line
+        (\tikztostart)--(\tikztotarget)
+    \else% normal bipole or source
+        \ifpgf@circuit@bipole@flow@before
+            (\tikztostart)--(anchorstartnode)
+        \else
+            (anchorendnode)--(\tikztotarget)
+        \fi
+    \fi
+    \pgfextra{
+        \ifpgf@circuit@bipole@flow@backward
+            \ifpgf@circuit@bipole@flow@below
+                \def\flow@offset{\ctikzvalof{flow/offset}\pgf@circ@Rlen}
+            \else
+                \def\flow@offset{-\ctikzvalof{flow/offset}\pgf@circ@Rlen}
+            \fi
+            \pgfmathsubtract{\pgf@circ@ffffff}{180}
+            \edef\pgf@circ@ffffff{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+            \else
+            \ifpgf@circuit@bipole@flow@below
+                \def\flow@offset{-\ctikzvalof{flow/offset}\pgf@circ@Rlen}
+            \else
+                \def\flow@offset{\ctikzvalof{flow/offset}\pgf@circ@Rlen}
+            \fi
+        \fi
+    }
+    coordinate[flowarrow,pos=\ctikzvalof{flow/distance},rotate=\pgf@circ@ffffff,yshift=\flow@offset](Farrowpos)
+    (Farrowpos.\pgf@circ@bipole@flow@label@where) node[anchor=\pgf@circ@dir]{ \pgf@circ@finallabels{flow/label}}
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
index 29943d5d569..1d386b5480b 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
@@ -5,224 +5,330 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Bipole label positioning
 
 %% Options
 \ctikzset{label/.style = { l=#1 } }
-\ctikzset{l/.code = { 
-	\pgfkeys{/tikz/circuitikz/bipole/label/name=#1}
-	\ctikzsetvalof{bipole/label/unit}{}
-	\ifpgf@circ@siunitx 
-		\pgf@circ@handleSI{#1}
-		\ifpgf@circ@siunitx@res 
-			\edef\pgf@temp{\pgf@circ@handleSI@val}
-			\pgfkeyslet{/tikz/circuitikz/bipole/label/name}{\pgf@temp}
-			\edef\pgf@temp{\pgf@circ@handleSI@unit}
-			\pgfkeyslet{/tikz/circuitikz/bipole/label/unit}{\pgf@temp}
-		\else
-		\fi
-	\else
-	\fi
+\ctikzset{l/.code = {
+        \pgfkeys{/tikz/circuitikz/bipole/label/name=#1}
+        \ctikzsetvalof{bipole/label/unit}{}
+        \ifpgf@circ@siunitx
+            \pgf@circ@handleSI{#1}
+            \ifpgf@circ@siunitx@res
+                \edef\pgf@temp{\pgf@circ@handleSI@val}
+                \pgfkeyslet{/tikz/circuitikz/bipole/label/name}{\pgf@temp}
+                \edef\pgf@temp{\pgf@circ@handleSI@unit}
+                \pgfkeyslet{/tikz/circuitikz/bipole/label/unit}{\pgf@temp}
+            \else
+        \fi
+        \else
+    \fi
 }}
 
-\ctikzset{label above/.code = { 
-		l=#1, 
-		\circuitikzbasekey/bipole/label/position=90 }
+\ctikzset{label above/.code = {
+        l=#1,
+    \circuitikzbasekey/bipole/label/position=90 }
 }
 
-\ctikzset{l^/.style = { 
-		l=#1,
-		\circuitikzbasekey/bipole/label/position=90 } 
+\ctikzset{l^/.style = {
+        l=#1,
+    \circuitikzbasekey/bipole/label/position=90 }
 }
 
-\ctikzset{label below/.code = { 
-		l=#1,
-		\circuitikzbasekey/bipole/label/position=-90 } 
+\ctikzset{label below/.code = {
+        l=#1,
+    \circuitikzbasekey/bipole/label/position=-90 }
 }
 
-\ctikzset{l_/.style = { 
-		l=#1,
-		\circuitikzbasekey/bipole/label/position=-90 } 
+\ctikzset{l_/.style = {
+        l=#1,
+    \circuitikzbasekey/bipole/label/position=-90 }
 }
 
 \ctikzset{annotation/.style = { a=#1 } }
 \ctikzset{a/.code = {
-		\pgfkeys{/tikz/circuitikz/bipole/annotation/name=#1}
-		\ctikzsetvalof{bipole/annotation/unit}{}
-		\ifpgf@circ@siunitx
-		\pgf@circ@handleSI{#1}
-		\ifpgf@circ@siunitx@res
-		\edef\pgf@temp{\pgf@circ@handleSI@val}
-		\pgfkeyslet{/tikz/circuitikz/bipole/annotation/name}{\pgf@temp}
-		\edef\pgf@temp{\pgf@circ@handleSI@unit}
-		\pgfkeyslet{/tikz/circuitikz/bipole/annotation/unit}{\pgf@temp}
-		\else
-		\fi
-		\else
-		\fi
-	}}
+    \pgfkeys{/tikz/circuitikz/bipole/annotation/name=#1}
+    \ctikzsetvalof{bipole/annotation/unit}{}
+    \ifpgf@circ@siunitx
+        \pgf@circ@handleSI{#1}
+        \ifpgf@circ@siunitx@res
+            \edef\pgf@temp{\pgf@circ@handleSI@val}
+            \pgfkeyslet{/tikz/circuitikz/bipole/annotation/name}{\pgf@temp}
+            \edef\pgf@temp{\pgf@circ@handleSI@unit}
+            \pgfkeyslet{/tikz/circuitikz/bipole/annotation/unit}{\pgf@temp}
+        \else
+        \fi
+    \else
+    \fi
+}}
 
-\ctikzset{annotation above/.code = { 
-	a=#1, 
-	\circuitikzbasekey/bipole/annotation/position=90 }
+\ctikzset{annotation above/.code = {
+        a=#1,
+    \circuitikzbasekey/bipole/annotation/position=90 }
 }
 
-\ctikzset{a^/.style = { 
-	a=#1,
-	\circuitikzbasekey/bipole/annotation/position=90 } 
+\ctikzset{a^/.style = {
+        a=#1,
+    \circuitikzbasekey/bipole/annotation/position=90 }
 }
 
-\ctikzset{annotation below/.code = { 
-	a=#1,
-	\circuitikzbasekey/bipole/annotation/position=-90 } 
+\ctikzset{annotation below/.code = {
+        a=#1,
+    \circuitikzbasekey/bipole/annotation/position=-90 }
 }
-\ctikzset{a_/.style = { 
-	a=#1,
-	\circuitikzbasekey/bipole/annotation/position=-90 } 
+\ctikzset{a_/.style = {
+        a=#1,
+    \circuitikzbasekey/bipole/annotation/position=-90 }
 }
 
-
+% This is to adjust spacing for the labels so that they are not cramped on components
+\def\pgf@circ@ls{.75ex} % labelspace to have just one point to change
 
 \def\pgf@circ@drawlabels#1{
-	\pgfextra{
-		\pgfmathsubtract{\pgf@circ@direction}{90}
-		\edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-		
-		\edef\pgf@circ@temp{\ctikzvalof{bipole/#1/position}} 
-		\ifnum \pgf@circ@temp < 0
-			\pgfmathadd{\pgf@circ@labanc}{180}
-			\edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-		\fi
-		\ifpgf@circuit@bipole@inverted
-			\pgfmathadd{\pgf@circ@temp}{180} %If shape is inverted, use opposite anchor
-			\edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-		\fi
-		
-		\ifnum \ctikzvalof{mirror value} = -1
-			\pgfmathadd{\pgf@circ@temp}{180} %If shape is mirrored, use opposite anchor
-			\edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-		\fi
-	}
-		%Firstly, place a coodinate directly at the edge of the shape
-		(\ctikzvalof{bipole/name}.\pgf@circ@temp) coordinate (labelcoor)
-		%now decide, which labels should be drawn
-		\pgfextra{
-			\edef\pgf@temp{\ctikzvalof{label/align}}
-			\def\pgf@circ@temp{straight}
-		}
-		\ifx\pgf@temp\pgf@circ@temp %straight
-			\pgf@circ@drawreglabels{#1}
-		\else
-			\pgfextra{\def\pgf@circ@temp{rotate}}
-			\ifx\pgf@temp\pgf@circ@temp %rotate
-				\pgf@circ@drawrotlabels{#1}
-			\else% smart
-				\pgf@circ@drawsmartlabels{#1}
-			\fi
-		\fi
+    \pgfextra{
+        % This function will be called with argument #1 equal
+        % to "label" or "annotation" form pgfcircpath.tex.
+        % pgf@circ@direction is the direction of the path,
+        % its value is set in pgfcircpath.tex
+        \pgfmathsubtract{\pgf@circ@direction}{90}
+        \pgfmathround{\pgfmathresult} % avoid precision loss errors
+        \edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+
+        \edef\pgf@circ@temp{\ctikzvalof{bipole/#1/position}}
+        \ifnum \pgf@circ@temp < 0
+                \pgfmathadd{\pgf@circ@labanc}{180}
+                \edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+        \fi
+        \ifpgf@circuit@bipole@inverted
+                \pgfmathadd{\pgf@circ@temp}{180} %If shape is inverted, use opposite anchor
+                \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+        \fi
+
+        \ifnum \ctikzvalof{mirror value} = -1
+                \pgfmathadd{\pgf@circ@temp}{180} %If shape is mirrored, use opposite anchor
+                \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+        \fi
+    }
+    %Firstly, place a coordinate directly at the edge of the shape
+    (\ctikzvalof{bipole/name}.\pgf@circ@temp) coordinate (labelcoor)
+    %now decide, which labels should be drawn
+    \pgfextra{
+            \edef\pgf@temp{\ctikzvalof{label/align}}
+            \def\pgf@circ@temp{straight}
+    }
+    \ifx\pgf@temp\pgf@circ@temp %straight
+            \pgf@circ@drawreglabels{#1}
+    \else
+            \pgfextra{\def\pgf@circ@temp{rotate}}
+            \ifx\pgf@temp\pgf@circ@temp %rotate
+                    \pgf@circ@drawrotlabels{#1}
+            \else% smart
+                    \pgf@circ@drawsmartlabels{#1}
+            \fi
+    \fi
 }
 
 
 \def\pgf@circ@drawsmartlabels#1{
-	\pgfextra{
-		\pgfmathmod{\pgf@circ@direction}{90}
-		\edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-	}
-	\ifnum \pgfcircmathresult > 20	
-		\ifnum \pgfcircmathresult < 70
-			\pgf@circ@drawrotlabels{#1}
-		\else
-			\pgf@circ@drawreglabels{#1}
-		\fi
-	\else
-		\pgf@circ@drawreglabels{#1}
-	\fi
-}
+    \pgfextra{
+        \pgfmathmod{\pgf@circ@direction}{90}
+        \edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+    }
+    \ifnum \pgfcircmathresult > 20
+    \ifnum \pgfcircmathresult < 70
+        \pgf@circ@drawrotlabels{#1}
+    \else
+        \pgf@circ@drawreglabels{#1}
+    \fi
+    \else
+        \pgf@circ@drawreglabels{#1}
+    \fi
+    }
 
 
 \def\pgf@circ@drawrotlabels#1{
-	\pgfextra{
-		\ifnum \ctikzvalof{bipole/#1/position}>0
-		%we need some more space for placement below, due to mid-anchor
-			\def\pgf@circ@labposdistance{1.5ex}
-			\else
-			\def\pgf@circ@labposdistance{2ex}
-		\fi
-		%Calculate rotation of the label from direction and strip decimals
-		\edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		% rotate the label at second or third quadrant:
-		\ifnum \pgfcirclabrot > 90 \ifnum \pgfcirclabrot < 270
-			\pgfmathsubtract{\pgf@circ@direction}{180}
-			\edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-			%invert the space relationships due to rotatet strings
-			\ifnum \ctikzvalof{bipole/#1/position}>0
-				\def\pgf@circ@labposdistance{2ex}
-			\else
-				\def\pgf@circ@labposdistance{1.5ex}
-			\fi
-		\fi\fi
-		\pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90}
-		\edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-	}				
-	(labelcoor)++(\pgf@circ@labposangle:\pgf@circ@labposdistance) coordinate(labelcoor)
-	node[anchor=mid,rotate=\pgfcirclabrot](\ctikzvalof{bipole/name}#1){\pgf@circ@finallabels{#1}}
+    \pgfextra{
+        % scale the distances in function of zoom, so that they are not
+        % dependent on it but on font size. Thanks to @marmot
+        % https://tex.stackexchange.com/a/476018/38080
+        % the coeffcient is adjusted so that the distance is more or less
+        % the same for rotated labels and straight ones (although it will
+        % depend on the font, so it's not exact).
+        \pgfgettransformentries{\tmp}{\tmp}{\tmp}{\myscale}{\tmp}{\tmp}
+        \pgfmathsetlength\pgf@circ@res@temp{1.5*\pgf@circ@ls/\myscale}
+        \ifnum \ctikzvalof{bipole/#1/position}>0
+        %we need some more space for placement below, due to mid-anchor
+            \else % we do not have <= in \ifnum...
+                \pgf@circ@res@temp=1.5\pgf@circ@res@temp
+        \fi
+        %Calculate rotation of the label from direction and strip decimals
+        \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+        % rotate the label at second or third quadrant:
+        \ifnum \pgfcirclabrot > 90 \ifnum \pgfcirclabrot < 270
+                \pgfmathsubtract{\pgf@circ@direction}{180}
+                \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+                %invert the space relationships due to rotated strings
+                \ifnum \ctikzvalof{bipole/#1/position}>0
+                        \pgf@circ@res@temp=1.5\pgf@circ@res@temp
+                \fi
+        \fi\fi
+        \pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90}
+        \edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+    }
+    % reset cm is not working correctly here
+    (labelcoor)++(\pgf@circ@labposangle:\the\pgf@circ@res@temp) coordinate(labelcoor)
+    node[anchor=mid, rotate=\pgfcirclabrot](\ctikzvalof{bipole/name}#1){\pgf@circ@finallabels{#1}}
 }
 
 \def\pgf@circ@drawreglabels#1{
-
-	%Now calculate all shape positions
-	%Use mid-anchor at x-axis and base-anchor at y-axis, respectively.
-	%All points between will be addressed by angled-anchors:
-	\pgfextra{
-		\pgfmathadd{\pgf@circ@labanc}{90}
-		\edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-		\pgfmathparse{mod(\pgf@circ@temp,180)>135?mod(\pgf@circ@temp,180)-180:mod(\pgf@circ@temp,180)}
-		\edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
-	}
-	%Values between -5 and 5 are at pos /neg x-axis, values around 90 are at both y-axis
-	\ifnum \pgfcircmathresult > 84 \ifnum \pgfcircmathresult< 96
-		\pgfextra{\edef\pgf@circ@labpos{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}}
-		\ifnum \pgf@circ@labpos > 180
-			\ifnum \ctikzvalof{bipole/#1/position} > 0
-				\pgfextra{\def\pgf@circ@labanc{mid west}}
-			\else
-				\pgfextra{\def\pgf@circ@labanc{mid east}}
-			\fi
-		\else
-			\ifnum \ctikzvalof{bipole/#1/position} > 0
-				\pgfextra{\def\pgf@circ@labanc{mid east}}
-			\else
-				\pgfextra{\def\pgf@circ@labanc{mid west}}
-			\fi
-		\fi
-	\fi\fi
-	\ifnum \pgfcircmathresult <6
-		\ifnum \ctikzvalof{bipole/#1/position} < 0
-			%we need some more space for placement below, due to mid-anchor
-			(labelcoor)++(-\pgf@circ@labanc:2ex) coordinate(labelcoor)
-		\else
-			(labelcoor)++(-\pgf@circ@labanc:1.5ex) coordinate(labelcoor)
-		\fi
-		\pgfextra{\def\pgf@circ@labanc{mid}}
-	\fi
-	 (labelcoor) node[anchor=\pgf@circ@labanc](\ctikzvalof{bipole/name}#1){\pgf@circ@finallabels{#1}}
+    %Now calculate all shape positions
+    %Use mid-anchor at x-axis and base-anchor at y-axis, respectively.
+    %All points between will be addressed by angled-anchors:
+    \pgfextra{
+        % scale ex-distance to make it independent on scale
+        % thanks @marmot see https://tex.stackexchange.com/a/476018/38080
+        \pgfgettransformentries{\tmp}{\tmp}{\tmp}{\myscale}{\tmp}{\tmp}
+        \pgfmathsetlength\pgf@circ@res@temp{\pgf@circ@ls/\myscale}
+        \pgfmathadd{\pgf@circ@labanc}{90}
+        \pgfmathround{\pgfmathresult}
+        \def\pgf@circ@labanctext{\pgf@circ@labanc}
+        \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+        \pgfmathparse{mod(\pgf@circ@temp,180)>135?mod(\pgf@circ@temp,180)-180:mod(\pgf@circ@temp,180)}
+        \edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+    }
+    %Values around 90 are at both y-axis
+    \ifnum \pgfcircmathresult > 84 \ifnum \pgfcircmathresult< 96
+        \pgfextra{\edef\pgf@circ@labpos{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}}
+        \ifnum \pgf@circ@labpos > 180
+            \ifnum \ctikzvalof{bipole/#1/position} > 0
+                    \pgfextra{\def\pgf@circ@labanctext{mid west}}
+            \else
+                    \pgfextra{\def\pgf@circ@labanctext{mid east}}
+            \fi
+        \else
+            \ifnum \ctikzvalof{bipole/#1/position} > 0
+                    \pgfextra{\def\pgf@circ@labanctext{mid east}}
+            \else
+                    \pgfextra{\def\pgf@circ@labanctext{mid west}}
+            \fi
+        \fi
+    \fi\fi
+    %Values between -5 and 5 are at pos /neg x-axis
+    \pgfextra{\def\uffa{}\newdimen\realshift\realshift=\dimexpr1pt\relax}
+        \ifnum \pgfcircmathresult <6 \ifnum \pgfcircmathresult > -6
+            \ifnum \ctikzvalof{bipole/#1/position} < 0
+                \ifnum \pgf@circ@labanc > 90
+                    % using base coordinate instead of south to naturally align
+                    % symbols with descendants; but this invalidate the effect of
+                    % the inner sep, so recover it by shifting the anchor
+                    % reset cm is not working sometime, use @marmot solution
+                    % see https://tex.stackexchange.com/a/476018/38080
+                    (labelcoor) ++(-\pgf@circ@labanc:\pgf@circ@res@temp) coordinate(labelcoor)
+                    \pgfextra{\def\pgf@circ@labanctext{base}}%base
+                \else
+                    \pgfextra{\def\pgf@circ@labanctext{north}}%north
+                \fi
+             \else
+                \ifnum \pgf@circ@labanc < 90
+                    % shift, as above
+                    (labelcoor) ++(-\pgf@circ@labanc:\pgf@circ@res@temp) coordinate(labelcoor)
+                    \pgfextra{\def\pgf@circ@labanctext{base}}%base
+                \else
+                    \ifnum \pgf@circ@labanc > 180
+                        % this shouldn't  happen, but somehow it does (270 degree anchors)
+                        % shift, as above
+                        (labelcoor) ++(-\pgf@circ@labanc:\pgf@circ@res@temp) coordinate(labelcoor)
+                         \pgfextra{\def\pgf@circ@labanctext{base}}%base
+                    \else
+                      \pgfextra{\def\pgf@circ@labanctext{north}}%north
+                   \fi
+                \fi
+            \fi
+        \fi\fi
+    (labelcoor) node[anchor=\pgf@circ@labanctext,
+        inner sep=0.5\pgf@circ@res@temp, outer sep=0pt,
+        ](\ctikzvalof{bipole/name}#1){\strut\pgf@circ@finallabels{#1}%
+    }
 }
 
 \def\pgf@circ@finallabels#1{%
-	\edef\pgf@temp{}%
-	\edef\pgf@circ@temp{\ctikzvalof{bipole/#1/unit}}%
-	\ifx\pgf@temp\pgf@circ@temp%
-	\ctikzvalof{bipole/#1/name}%
-	\else%
-	$\SI{\ctikzvalof{bipole/#1/name}}{\ctikzvalof{bipole/#1/unit}}$%
-	\fi%
+    \edef\pgf@temp{}%
+    \edef\pgf@circ@temp{\ctikzvalof{bipole/#1/unit}}%
+    \ifx\pgf@temp\pgf@circ@temp%
+        \ctikzvalof{bipole/#1/name}%
+    \else%
+        $\SI{\ctikzvalof{bipole/#1/name}}{\ctikzvalof{bipole/#1/unit}}$%
+    \fi%
 }
 
 \ctikzset{text/.style = { t=#1 } }
-\ctikzset{t/.code = { 
-	\ctikzsetvalof{bipoles/twoport/text}{#1}
+\ctikzset{t/.code = {
+        \ctikzsetvalof{bipoles/twoport/text}{#1}
+}}
+
+%%%% Stacked labels
+%
+% stacked labels by Romano Giannetti romano@rgtti.com
+% heavily based on Claudo Fiandrinos's https://tex.stackexchange.com/a/65792/38080
+% \expandafter trick inspired by Matthew Leingang's https://tex.stackexchange.com/a/12272/38080
+%
+% labels are in a tabular, globally aligned:
+%        vertically with key l2 valign (default c)
+%        c: center t: top b: bottom
+%        horizontally with key l2 align (default l)
+%        l: left c: centered r: right
+% you can switch sides using l2_=... and l2^=...
+% syntax is l2_ = line1 and line2 (same for l2^)
+%
+\ctikzset{%
+    l2 valign/.store in=\ltwo@valign, l2 valign=c,
+    l2 halign/.store in=\ltwo@halign, l2 halign=l,
+}
+\ctikzset{l2base/.code n args={2}{
+  \pgfkeys{/tikz/circuitikz/bipole/label/name=%
+        \bgroup
+        \setlength{\tabcolsep}{2pt}%
+        \def\ltwo@tabu{\tabular[\ltwo@valign]}%
+        \expandafter\ltwo@tabu\expandafter{\ltwo@halign}%
+        #1\\ #2%
+        \endtabular
+        \egroup
+    }%
+    \ctikzsetvalof{bipole/label/unit}{}
+    \ifpgf@circ@siunitx
+        \pgf@circ@handleSI{#2}
+        \ifpgf@circ@siunitx@res
+            \edef\pgf@temp{\pgf@circ@handleSI@val}
+            \pgfkeyslet{/tikz/circuitikz/bipole/label/name}{\pgf@temp}
+            \edef\pgf@temp{\pgf@circ@handleSI@unit}
+            \pgfkeyslet{/tikz/circuitikz/bipole/label/unit}{\pgf@temp}
+        \else
+        \fi
+    \else
+    \fi
 }}
-\endinput
\ No newline at end of file
+\ctikzset{l2/.style args={#1 and #2}{
+        l2base={#1}{#2},
+    \circuitikzbasekey/bipole/label/position=90 }
+}
+\ctikzset{l2 above/.style args={#1 and #2}{
+        l2base={#1}{#2},
+    \circuitikzbasekey/bipole/label/position=90 }
+}
+\ctikzset{l2^/.style args={#1 and #2}{
+        l2base={#1}{#2},
+    \circuitikzbasekey/bipole/label/position=90 }
+}
+\ctikzset{l2 below/.style args={#1 and #2}{
+        l2base={#1}{#2},
+    \circuitikzbasekey/bipole/label/position=-90 }
+}
+\ctikzset{l2_/.style args={#1 and #2}{
+        l2base={#1}{#2},
+    \circuitikzbasekey/bipole/label/position=-90 }
+}
+
+\endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
index e8feabfc80c..66f2d8dd511 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
@@ -5,336 +5,692 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Monopoles
 
 %% Ground symbol
+% #1 -> name
+% #2 -> width
+% #3 -> depth
+% #4 -> code
+\long\def\pgf@circ@declareground#1#2#3#4{
+    \pgfdeclareshape{#1}{
+        \savedanchor{\southeast}{
+            \pgf@x=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
+            \pgf@x=#2\pgf@x
+            \pgf@y=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
+            \pgf@y=-#3\pgf@y
+        }
+        \anchor{north}{\pgfpointorigin}
+        \anchor{north east}{\southeast\pgf@y=0pt\relax}
+        \anchor{east}{\southeast\pgf@y=.5\pgf@y}
+        \anchor{south east}{\southeast}
+        \anchor{south}{\southeast\pgf@x=0pt\relax}
+        \anchor{south west}{\southeast\pgf@x=-\pgf@x}
+        \anchor{west}{\southeast\pgf@y=.5\pgf@y\pgf@x=-\pgf@x}
+        \anchor{north west}{\southeast\pgf@y=0pt\pgf@x=-\pgf@x}
+        \anchor{left}{\pgfpointorigin}
+        \anchor{right}{\pgfpointorigin}
+        \anchor{center}{\pgfpointorigin}
+        \behindforegroundpath{
+            \pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
+            \pgfscope
+                \pgfstartlinewidth=\pgflinewidth
+                #4
+            \endpgfscope
+        }
+    }
+}
 
-\pgfdeclareshape{ground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			%\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfpathmoveto{\pgfpoint{-.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw}
-		
-			
-			\pgfsetlinewidth{\pgfstartlinewidth}
-	
-		\endpgfscope
-	}
 
+\pgf@circ@declareground{ground}{0.6}{1.6}{
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/connectionthickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-1.2\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.25\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 
 
-\pgfdeclareshape{rground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-						
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-	
-		\endpgfscope
-	}
+\pgf@circ@declareground{rground}{0.6}{1}{
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetlinewidth{\ctikzvalof{monopoles/rground/thickness}\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfsetroundcap\pgfusepath{draw}
 }
 
-\pgfdeclareshape{tground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			%\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/monopoles/tground/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-			\pgfusepath{draw}
-						
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-	
-		\endpgfscope
-	}
+\pgf@circ@declareground{tground}{0.6}{0}{
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfusepath{draw}
+
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/monopoles/tground/thickness}\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{0pt}}
+    \pgfusepath{draw}
 }
 
-\pgfdeclareshape{sground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{0}{-1.8\pgf@circ@res@step}}
-			\pgfpathclose
-			\pgfusepath{draw}
-						
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-	
-		\endpgfscope
-	}
+\pgf@circ@declareground{sground}{0.6}{1.8}{
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0}{-1.8\pgf@circ@res@step}}
+    \pgfpathclose
+    \pgf@circ@draworfill
 }
 
 % noiseless ground
-\pgfdeclareshape{nground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			%\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfpathmoveto{\pgfpoint{-.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfusepath{draw}
-			
-			\pgfpathmoveto{\pgfpoint{1.3\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfpatharc{0}{180}{1.3\pgf@circ@res@step}
-			\pgfusepath{draw}
-					
-			\pgfsetlinewidth{\pgfstartlinewidth}
-		\endpgfscope
-	}
+\pgf@circ@declareground{nground}{0.9}{1.6}{
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/connectionthickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-1.2\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.25\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.9\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
+    \pgfpatharc{0}{180}{0.9\pgf@circ@res@step}
+    \pgfusepath{draw}
 }
 
 % protective ground
-\pgfdeclareshape{pground}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/ground/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-
-			\pgfstartlinewidth=\pgflinewidth
-			%\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfpathcircle{\pgfpoint{0pt}{-\pgf@circ@res@step}} {1.2\pgf@circ@res@step}
-			\pgfusepath{draw}
-						
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfpathmoveto{\pgfpoint{-.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.8\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.6\pgf@circ@res@step}}
-			\pgfusepath{draw}
-					
-			\pgfsetlinewidth{\pgfstartlinewidth}
-		\endpgfscope
-	}
+\pgf@circ@declareground{pground}{0.9}{1.8}{
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/connectionthickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-1\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.6\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1.2\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.25\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@step}{-1.4\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathcircle{\pgfpoint{0pt}{-0.9\pgf@circ@res@step}}{0.9\pgf@circ@res@step}
+    \pgfusepath{draw}
 }
 
-% chassis ground 
-\pgfdeclareshape{cground}{ 
-\anchor{center}{ 
-    \pgfpointorigin 
-} 
-\behindforegroundpath{       
-    \pgf@circ@res@step=\ctikzvalof{monopoles/chassis/width}\pgf@circ@Rlen 
- 
-    \pgfscope        
-        \pgfpathmoveto{\pgfpointorigin} 
-        \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}} 
-        \pgfusepath{draw}
+% chassis ground
+\pgf@circ@declareground{cground}{1}{2}{
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/connectionthickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-1.5\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfsetlinewidth{\ctikzvalof{monopoles/ground/thickness}\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-1.00\pgf@circ@res@step}{-2.10\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{-0.75\pgf@circ@res@step}{-1.50\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{ 0.75\pgf@circ@res@step}{-1.50\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{ 0.50\pgf@circ@res@step}{-2.10\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{ 0.00\pgf@circ@res@step}{-1.50\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{-0.25\pgf@circ@res@step}{-2.10\pgf@circ@res@step}}
+    \pgfusepath{draw}
+}
+
+% Contributed by @fotesan https://github.com/fotesan
+
+\pgf@circ@declareground{eground}{1.1}{1.7}{
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/monopoles/tground/thickness}\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-1.1\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{-.6\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.6\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{-.1\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.1\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.9\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfusepath{draw}
+}
 
-        \pgfpathmoveto{\pgfpoint{-1.5\pgf@circ@res@step}{-2\pgf@circ@res@step}}
-        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
-        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{-2\pgf@circ@res@step}}
-        \pgfpathmoveto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
-        \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-2\pgf@circ@res@step}}
-        \pgfusepath{draw}                        
-    \endpgfscope 
-    } 
+\pgf@circ@declareground{eground2}{1.1}{1.7}{
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/monopoles/tground/thickness}\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{-\pgf@circ@res@step}}
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{-1.1\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.45\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-1.7\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{.9\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfusepath{draw}
 }
 
 % Contributed by Leonardo Azzinnari
 \pgfdeclareshape{tlinestub}{
-	\anchor{center}{\pgfpointorigin}
-	\behindforegroundpath{
-		\pgfstartlinewidth=\pgflinewidth
-		
-		\pgf@circ@res@step=\ctikzvalof{bipoles/tline/width} \pgf@circ@Rlen
-        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
-        
-            \pgfpathmoveto{\pgfpointorigin}
-            \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0pt}}
-            \pgfusepath{draw}
-         \pgfscope
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step = \ctikzvalof{bipoles/tline/width} \pgf@circ@Rlen
+        \pgf@x=1.625\pgf@circ@res@step
+        \pgf@circ@res@step = \ctikzvalof{bipoles/tline/width} \pgf@circ@Rlen
+        \pgf@y=.25\pgf@circ@res@step%
+    }
+    % the center is on the left side of the shape for facility of usage
+    \anchor{north}{\northeast\pgf@x=0.5\pgf@x\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0.5\pgf@x\relax}
+    \anchor{west}{\pgfpointorigin}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=0cm\relax}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south west}{\northeast\pgf@x=0cm\pgf@y=-\pgf@y}
+    \anchor{center}{\pgfpointorigin}
+    \behindforegroundpath{
+        \pgfstartlinewidth=\pgflinewidth
+
+        \pgf@circ@res@step=\ctikzvalof{bipoles/tline/width} \pgf@circ@Rlen
+
+        \pgfscope\begin{pgftransparencygroup}
             \pgfpathellipse{\pgfpoint{0.5\pgf@circ@res@step}{0\pgf@circ@res@step}}{\pgfpoint{0.125\pgf@circ@res@step}{0\pgf@circ@res@step}}{\pgfpoint{0\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
+            \pgf@circ@maybefill
+            \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
             \pgfpathlineto{\pgfpoint{1.5\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
             \pgfpatharc{90}{-90}{0.125\pgf@circ@res@step and 0.25\pgf@circ@res@step}
             \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{-0.25\pgf@circ@res@step}}
             \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgf@circ@draworfill
+            \pgfpathellipse{\pgfpoint{0.5\pgf@circ@res@step}{0\pgf@circ@res@step}}{\pgfpoint{0.125\pgf@circ@res@step}{0\pgf@circ@res@step}}{\pgfpoint{0\pgf@circ@res@step}{0.25\pgf@circ@res@step}}
+            \pgfusepath{draw}
+        \end{pgftransparencygroup} \endpgfscope
+        \pgfpathmoveto{\pgfpointorigin}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0pt}}
+        \pgfusepath{draw}
+    }
+}
+
+%% New antennas without tails
+
+% main body
+\def\pgf@circ@antennabody{%
+    \pgfstartlinewidth=\pgflinewidth
+    \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+    \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+    \pgfscope
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpointorigin}
+        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@step}{2\pgf@circ@res@step}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{2\pgf@circ@res@step}}
+        \pgfsetbeveljoin
+        \pgfpathclose
+        \pgf@circ@draworfill
+    \endpgfscope
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpointorigin}
+    \pgfpathlineto{\pgfpoint{0pt}{2\pgf@circ@res@step}}
+    \pgfusepath{draw}
+}
+
+% Waves for the antennas.
+\def\pgf@circ@antennawaves{%
+    \pgfscope
+    % define a triangle for clipping the waves
+    \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{4.2\pgf@circ@res@step}{3\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{4.2\pgf@circ@res@step}{-1\pgf@circ@res@step}}
+    \pgfpathclose
+    \pgfusepath{clip}
+    % ...and build the waves as clipped circles
+    \c@pgf@counta=8\pgf@circ@res@other=0.5\pgf@circ@res@step
+    \pgfmathloop%
+    \ifnum\c@pgf@counta>2
+        \pgfpathcircle{\pgfpoint{0pt}{\pgf@circ@res@step}}{\the\c@pgf@counta*\pgf@circ@res@other}
+        \advance\c@pgf@counta-1\relax%
+        \repeatpgfmathloop
+        \pgfusepath{draw}
+    \endpgfscope
+}
+
+
+% additional shape with the waves
+\pgfdeclareshape{waves}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/waves/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step
+        \pgf@y=\pgf@circ@res@step
+    }
+    \anchor{text}{
+        \northeast
+        \pgf@y=\dimexpr\pgf@y+.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+    }
+    \anchor{top}{\northeast\pgf@x=0pt}
+    \anchor{right}{\northeast\pgf@y=0pt}
+    \anchor{left}{\northeast\pgf@x=-\pgf@x\pgf@y=0pt}
+    \anchor{bottom}{\northeast\pgf@y=-\pgf@y\pgf@x=0pt}
+    \anchor{north}{\northeast\pgf@x=0pt}
+    \anchor{north east}{\northeast}
+    \anchor{east}{\northeast\pgf@y=0pt}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y\pgf@x=0pt}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0pt}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \behindforegroundpath{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/waves/width}\pgf@circ@Rlen
+        \pgf@circ@res@step=0.5\pgf@circ@res@step
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgfscope
+        % define a triangle for clipping the waves
+        \pgfpathmoveto{\pgfpoint{-2\pgf@circ@res@step}{0pt}}
+        \pgfpathlineto{\pgfpoint{2.1\pgf@circ@res@step}{2\pgf@circ@res@step}}
+        \pgfpathlineto{\pgfpoint{2.1\pgf@circ@res@step}{-2\pgf@circ@res@step}}
+        \pgfpathclose
+        \pgfusepath{clip}
+        % ...and build the waves as clipped circles
+        \c@pgf@counta=8\pgf@circ@res@other=0.5\pgf@circ@res@step
+        \pgfmathloop%
+        \ifnum\c@pgf@counta>1
+            \pgfpathcircle{\pgfpoint{-2\pgf@circ@res@step}{0pt}}{\the\c@pgf@counta*\pgf@circ@res@other}
+            \advance\c@pgf@counta-1\relax%
+            \repeatpgfmathloop
             \pgfusepath{draw}
-         \endpgfscope
-      }
+        \endpgfscope
+    }
+}
+
+% the three types of antennas: simple, TX, RX. Notice that you can flip them...
+
+\pgfdeclareshape{bareantenna}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step
+        \pgf@y=2\pgf@circ@res@step
+    }
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/bareantenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/bareantenna/label/yanchor}\pgf@y
+        \pgf@y=\dimexpr\pgf@y+.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+    }
+    \anchor{top}{\northeast\pgf@x=0pt}
+    \anchor{right}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{left}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{bottom}{\pgfpointorigin}
+    \anchor{north}{\northeast\pgf@x=0pt}
+    \anchor{east}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{south}{\pgfpointorigin}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=0pt\relax}
+    \anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+    \behindforegroundpath{
+        \pgf@circ@antennabody
+    }
 }
-                            
 
+\pgfdeclareshape{bareTXantenna}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step
+        \pgf@y=2\pgf@circ@res@step
+    }
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/bareantenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/bareantenna/label/yanchor}\pgf@y
+        \pgf@x=\dimexpr-\pgf@x-\wd\pgfnodeparttextbox\relax
+        \pgf@y=\dimexpr\pgf@y+.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+    }
+    \anchor{waves}{
+        \northeast
+        \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+        \pgf@x=4.2\pgf@circ@res@step
+        \pgf@y=\pgf@circ@res@step
+    }
+    \anchor{top}{\northeast\pgf@x=0pt}
+    \anchor{right}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{left}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{bottom}{\pgfpointorigin}
+    \anchor{north}{\northeast\pgf@x=0pt}
+    \anchor{east}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{south}{\pgfpointorigin}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=0pt\relax}
+    \anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+    \behindforegroundpath{
+        \pgf@circ@antennabody
+        \pgf@circ@antennawaves
+    }
+}
 
+\pgfdeclareshape{bareRXantenna}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step
+        \pgf@y=2\pgf@circ@res@step
+    }
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/bareantenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/bareantenna/label/yanchor}\pgf@y
+        \pgf@y=\dimexpr\pgf@y+.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+    }
+    \anchor{waves}{
+        \northeast
+        \pgf@circ@res@step=\ctikzvalof{monopoles/bareantenna/width}\pgf@circ@Rlen
+        \pgf@x=-4.2\pgf@circ@res@step
+        \pgf@y=\pgf@circ@res@step
+    }
+    \anchor{top}{\northeast\pgf@x=0pt}
+    \anchor{right}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{left}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{bottom}{\pgfpointorigin}
+    \anchor{north}{\northeast\pgf@x=0pt}
+    \anchor{east}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{west}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{south}{\pgfpointorigin}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=0pt\relax}
+    \anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+    \behindforegroundpath{
+        \pgf@circ@antennabody
+        \pgftransformxshift{-5.2\pgf@circ@res@step}
+        \pgf@circ@antennawaves
+    }
+}
+
+% Microstrip monopoles
+
+\pgfdeclareshape{mslstub}{
+    \savedanchor{\southeast}{
+        \pgf@x=\ctikzvalof{bipoles/mstline/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@y=\ctikzvalof{bipoles/mstline/height}\pgf@circ@Rlen
+        \pgf@y=-.5\pgf@y
+    }
+    \savedanchor{\northwest}{
+        \pgf@x=\ctikzvalof{bipoles/mstline/width}\pgf@circ@Rlen
+        \pgf@x=-.5\pgf@x
+        \pgf@y=\ctikzvalof{bipoles/mstline/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+    }
+    \anchor{north}{\northwest\pgf@x=0pt\relax}
+    \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+    \anchor{east}{\southeast\pgf@y=0pt\relax}
+    \anchor{south east}{\southeast}
+    \anchor{south}{\southeast\pgf@x=0pt\relax}
+    \anchor{south west}{\southeast\pgf@x=-\pgf@x}
+    \anchor{west}{\northwest\pgf@y=0pt\relax}
+    \anchor{north west}{\northwest}
+    %
+    \anchor{center}{\northwest\pgf@y=0pt\relax}
+    \anchor{left}{\northwest\pgf@y=0pt\relax}
+    \anchor{right}{\southeast\pgf@y=0pt\relax}
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+    \behindbackgroundpath{
+        \pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfextractx{\pgf@circ@res@right}{\southeast}
+        \pgfextractx{\pgf@circ@res@left}{\northwest}
+        \pgfextracty{\pgf@circ@res@down}{\southeast}
+        \pgfmathsetlength{\pgf@circ@res@step}{0.25*\pgf@circ@res@up}
+        \pgfstartlinewidth=\pgflinewidth
+        \pgfscope
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgf@circ@draworfill
+        \endpgfscope
+    }
+}
+
+\pgfdeclareshape{msrstub}{
+    \savedanchor{\southeast}{
+        \pgf@x=\ctikzvalof{monopoles/msrstub/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@y=0pt\relax
+    }
+    \savedanchor{\northwest}{
+        \pgf@x=\ctikzvalof{monopoles/msrstub/width}\pgf@circ@Rlen
+        \pgf@x=-.5\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/msrstub/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+    }
+    \anchor{north}{\northwest\pgf@x=0pt\relax}
+    \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+    \anchor{east}{\southeast\pgf@y=0pt\relax}
+    \anchor{south east}{\southeast}
+    \anchor{south}{\southeast\pgf@x=0pt\relax}
+    \anchor{south west}{\southeast\pgf@x=-\pgf@x}
+    \anchor{west}{\northwest\pgf@y=0pt\relax}
+    \anchor{north west}{\northwest}
+    %
+    \anchor{center}{\pgfpointorigin}
+    \anchor{left}{\pgfpointorigin}
+    \anchor{right}{\pgfpointorigin}
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+    \behindbackgroundpath{
+        \pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfextractx{\pgf@circ@res@right}{\southeast}
+        \pgfextractx{\pgf@circ@res@left}{\northwest}
+        \pgfextracty{\pgf@circ@res@down}{\southeast}
+        \pgfmathsetlength{\pgf@circ@res@step}{0.25*\pgf@circ@res@up}
+        \pgfstartlinewidth=\pgflinewidth
+        \pgfscope
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@step}}
+            \pgfusepath{draw}
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpointpolar{135}{\pgf@circ@res@step}}
+            \pgfpatharc{135}{45}{\pgf@circ@res@step}
+            \pgfpathlineto{\pgfpointpolar{45}{\pgf@circ@res@up}}
+            \pgfpatharc{45}{135}{\pgf@circ@res@up}
+            \pgfclosepath
+            % \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgf@circ@draworfill
+        \endpgfscope
+    }
+}
+
+\pgfdeclareshape{msport}{
+    \savedanchor{\southeast}{
+        \pgf@x=\ctikzvalof{monopoles/msport/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@y=\ctikzvalof{bipoles/mstline/height}\pgf@circ@Rlen
+        \pgf@y=-.5\pgf@y
+    }
+    \savedanchor{\northwest}{
+        \pgf@x=\ctikzvalof{monopoles/msport/width}\pgf@circ@Rlen
+        \pgf@x=-.5\pgf@x
+        \pgf@y=\ctikzvalof{bipoles/mstline/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+    }
+    \anchor{north}{\northwest\pgf@x=0pt\relax}
+    \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+    \anchor{east}{\southeast\pgf@y=0pt\relax}
+    \anchor{south east}{\southeast}
+    \anchor{south}{\southeast\pgf@x=0pt\relax}
+    \anchor{south west}{\southeast\pgf@x=-\pgf@x}
+    \anchor{west}{\northwest\pgf@y=0pt\relax}
+    \anchor{north west}{\northwest}
+    %
+    \anchor{center}{\northwest\pgf@y=0pt\relax}
+    \anchor{left}{\northwest\pgf@y=0pt\relax}
+    \anchor{right}{\southeast\pgf@y=0pt\relax}
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr-.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox\relax
+        }
+    }
+    \behindbackgroundpath{
+        \pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfextractx{\pgf@circ@res@right}{\southeast}
+        \pgfextractx{\pgf@circ@res@left}{\northwest}
+        \pgfextracty{\pgf@circ@res@down}{\southeast}
+        \pgfmathsetlength{\pgf@circ@res@step}{0.5*\pgf@circ@res@up}
+        \pgfstartlinewidth=\pgflinewidth
+        \pgfscope
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@step}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@step}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+    }
+}
+% Legacy antennas (with tails)
+
+\def\pgf@circ@shift@antenna@xy#1#2{%
+    \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
+    \pgf@y=\dimexpr\pgf@y+#2\pgf@circ@res@step
+    \pgf@x=\dimexpr\pgf@x+#1\pgf@circ@res@step
+\relax}
 
 \pgfdeclareshape{antenna}{
-\anchor{center}{\pgfpointorigin}
-	\savedanchor{\northeast}{
-		\pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
-		\pgf@x=5\pgf@circ@res@step%-0.5\pgflinewidth
-		\pgf@y=6\pgf@circ@res@step
-	}
-	\anchor{text}{
-		\northeast
-		\pgf@x=\ctikzvalof{monopoles/antenna/label/xanchor}\pgf@x
-		\pgf@y=\ctikzvalof{monopoles/antenna/label/yanchor}\pgf@y
-	}
-   \behindforegroundpath{
-     \pgfstartlinewidth=\pgflinewidth
-     \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
-                           
-        % \pgfpathmoveto{\pgfpointorigin}
-        % \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step}{0pt}}
-        % \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
-        %     \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-        
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step%-0.5\pgflinewidth
+        \pgf@y=4\pgf@circ@res@step
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\pgf@circ@shift@antenna@xy{0}{2}}
+    \anchor{east}{\northeast\pgf@y=0cm\pgf@circ@shift@antenna@xy{0}{3}\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\pgf@circ@shift@antenna@xy{0}{4}\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{0}{3}}
+    \anchor{north east}{\northeast\pgf@circ@shift@antenna@xy{0}{2}}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{0}{2}}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y\pgf@circ@shift@antenna@xy{0}{4}}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{0}{4}}
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/antenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/antenna/label/yanchor}\pgf@y
+    }
+    \behindforegroundpath{
+        \pgfstartlinewidth=\pgflinewidth
+        \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
+
         \pgftransformxshift{ -4\pgf@circ@res@step }
 
         \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
         \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             
-         \pgfusepath{draw}
-             
-          \pgfscope   
-          \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-             \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-             \pgfusepath{draw}
-           \endpgfscope
-                           \pgfsetlinewidth{\pgfstartlinewidth}
-                        
-                           }
-     }
+
+        \pgfusepath{draw}
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+        \pgfsetlinewidth{\pgfstartlinewidth}
+
+    }
+}
 
 
 \pgfdeclareshape{txantenna}{
-	\anchor{center}{\pgfpointorigin}
-	\savedanchor{\northeast}{
-		\pgf@circ@res@step=\ctikzvalof{monopoles/txantenna/width}\pgf@circ@Rlen
-		\pgf@x=5\pgf@circ@res@step%-0.5\pgflinewidth
-		\pgf@y=6\pgf@circ@res@step
-	}
-	\anchor{text}{
-		\northeast
-		\pgf@x=\ctikzvalof{monopoles/txantenna/label/xanchor}\pgf@x
-		\pgf@y=\ctikzvalof{monopoles/txantenna/label/yanchor}\pgf@y
-	}
-       \behindforegroundpath{
-       \pgfstartlinewidth=\pgflinewidth
-       \pgf@circ@res@step=\ctikzvalof{monopoles/txantenna/width}\pgf@circ@Rlen
-        
-         \pgfpathmoveto{\pgfpointorigin}
-         \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step}{0pt}}
-         \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             
-         \pgfusepath{draw}
-             
-          \pgfscope   
-          \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-             \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-             \pgfusepath{draw}
-           \endpgfscope
-          \pgfpathmoveto{\pgfpoint{5.5\pgf@circ@res@step}{6\pgf@circ@res@step}}
-%        \pgfpatharc{60}{-60}{\pgf@circ@res@step and \pgf@circ@res@step}
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step%-0.5\pgflinewidth
+        \pgf@y=4\pgf@circ@res@step
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\pgf@circ@shift@antenna@xy{2}{2}}
+    \anchor{east}{\northeast\pgf@y=0cm\pgf@circ@shift@antenna@xy{4}{3}\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\pgf@circ@shift@antenna@xy{2}{4}\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{3}}
+    \anchor{north east}{\northeast\pgf@circ@shift@antenna@xy{4}{2}}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{2}}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y\pgf@circ@shift@antenna@xy{4}{4}}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{4}}
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/txantenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/txantenna/label/yanchor}\pgf@y
+    }
+    \behindforegroundpath{
+        \pgfstartlinewidth=\pgflinewidth
+        \pgf@circ@res@step=\ctikzvalof{monopoles/txantenna/width}\pgf@circ@Rlen
+
+        \pgfpathmoveto{\pgfpointorigin}
+        \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step}{0pt}}
+        \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
+        \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+
+        \pgfusepath{draw}
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+        \pgfpathmoveto{\pgfpoint{5.5\pgf@circ@res@step}{6\pgf@circ@res@step}}
+        %        \pgfpatharc{60}{-60}{\pgf@circ@res@step and \pgf@circ@res@step}
         \pgfpatharc{30}{-30}{2\pgf@circ@res@step}         \pgfpathmoveto{\pgfpoint{6\pgf@circ@res@step}{6.25\pgf@circ@res@step}}
         \pgfpatharc{30}{-30}{2.5\pgf@circ@res@step}
         \pgfpathmoveto{\pgfpoint{6.5\pgf@circ@res@step}{6.5\pgf@circ@res@step}}
@@ -345,161 +701,208 @@
         \pgfpatharc{30}{-30}{4\pgf@circ@res@step}
         \pgfusepath{draw}
         \pgfsetlinewidth{\pgfstartlinewidth}
-        
-        }
-     }
+
+    }
+}
 
 
 \pgfdeclareshape{rxantenna}{
-	\anchor{center}{\pgfpointorigin}
-	\savedanchor{\northeast}{
-		\pgf@circ@res@step=\ctikzvalof{monopoles/txantenna/width}\pgf@circ@Rlen
-		\pgf@x=5\pgf@circ@res@step%-0.5\pgflinewidth
-		\pgf@y=6\pgf@circ@res@step
-	}
-	\anchor{text}{
-		\northeast
-		\pgf@x=\ctikzvalof{monopoles/rxantenna/label/xanchor}\pgf@x
-		\pgf@y=\ctikzvalof{monopoles/rxantenna/label/yanchor}\pgf@y
-	}
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor{\northeast}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/antenna/width}\pgf@circ@Rlen
+        \pgf@x=\pgf@circ@res@step%-0.5\pgflinewidth
+        \pgf@y=4\pgf@circ@res@step
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\pgf@circ@shift@antenna@xy{2}{2}}
+    \anchor{east}{\northeast\pgf@y=0cm\pgf@circ@shift@antenna@xy{4}{3}\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\pgf@circ@shift@antenna@xy{2}{4}\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{3}}
+    \anchor{north east}{\northeast\pgf@circ@shift@antenna@xy{4}{2}}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{2}}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y\pgf@circ@shift@antenna@xy{4}{4}}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x\pgf@circ@shift@antenna@xy{1}{4}}
+    \anchor{text}{
+        \northeast
+        \pgf@x=\ctikzvalof{monopoles/rxantenna/label/xanchor}\pgf@x
+        \pgf@y=\ctikzvalof{monopoles/rxantenna/label/yanchor}\pgf@y
+    }
     \behindforegroundpath{
         \pgfstartlinewidth=\pgflinewidth
         \pgf@circ@res@step=\ctikzvalof{monopoles/rxantenna/width}\pgf@circ@Rlen
-             
-         \pgfpathmoveto{\pgfpointorigin}
-         \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step}{0pt}}
-         \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             
-         \pgfusepath{draw}
-             
-          \pgfscope   
-          \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
-             \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-             \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-             \pgfusepath{draw}
-           \endpgfscope
-           
-           \pgfpathmoveto{\pgfpoint{6\pgf@circ@res@step}{7\pgf@circ@res@step}}
-%             \pgfpatharc{60}{-60}{\pgf@circ@res@step and \pgf@circ@res@step}
-             \pgfpatharc{150}{210}{4\pgf@circ@res@step}              \pgfpathmoveto{\pgfpoint{6.5\pgf@circ@res@step}{6.75\pgf@circ@res@step}}
-             \pgfpatharc{150}{210}{3.5\pgf@circ@res@step}
-             \pgfpathmoveto{\pgfpoint{7\pgf@circ@res@step}{6.5\pgf@circ@res@step}}
-             \pgfpatharc{150}{210}{3\pgf@circ@res@step}
-             \pgfpathmoveto{\pgfpoint{7.5\pgf@circ@res@step}{6.25\pgf@circ@res@step}}
-             \pgfpatharc{150}{210}{2.5\pgf@circ@res@step}
-             \pgfpathmoveto{\pgfpoint{8\pgf@circ@res@step}{6\pgf@circ@res@step}}
-             \pgfpatharc{150}{210}{2\pgf@circ@res@step}
-             \pgfusepath{draw}
-             \pgfsetlinewidth{\pgfstartlinewidth}
-             
-             }
+
+        \pgfpathmoveto{\pgfpointorigin}
+        \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step}{0pt}}
+        \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{0pt}}
+        \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+
+        \pgfusepath{draw}
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{5\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{4\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{3\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{4\pgf@circ@res@step-0.5\pgflinewidth}{6\pgf@circ@res@step}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint{6\pgf@circ@res@step}{7\pgf@circ@res@step}}
+        %             \pgfpatharc{60}{-60}{\pgf@circ@res@step and \pgf@circ@res@step}
+        \pgfpatharc{150}{210}{4\pgf@circ@res@step}              \pgfpathmoveto{\pgfpoint{6.5\pgf@circ@res@step}{6.75\pgf@circ@res@step}}
+        \pgfpatharc{150}{210}{3.5\pgf@circ@res@step}
+        \pgfpathmoveto{\pgfpoint{7\pgf@circ@res@step}{6.5\pgf@circ@res@step}}
+        \pgfpatharc{150}{210}{3\pgf@circ@res@step}
+        \pgfpathmoveto{\pgfpoint{7.5\pgf@circ@res@step}{6.25\pgf@circ@res@step}}
+        \pgfpatharc{150}{210}{2.5\pgf@circ@res@step}
+        \pgfpathmoveto{\pgfpoint{8\pgf@circ@res@step}{6\pgf@circ@res@step}}
+        \pgfpatharc{150}{210}{2\pgf@circ@res@step}
+        \pgfusepath{draw}
+        \pgfsetlinewidth{\pgfstartlinewidth}
+
+    }
 }
 
 % Vcc
 \pgfdeclareshape{vcc}{
-\anchor{center}{\pgfpointorigin}
-\anchor{text}{
-	\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
-	\pgfpathmoveto{\pgfpoint{-.5\wd\pgfnodeparttextbox}{2\pgf@circ@res@step+2\ht\pgfnodeparttextbox}}                          
-	\pgfpathmoveto{\pgfpoint{.5\wd\pgfnodeparttextbox}{2\pgf@circ@res@step+2\ht\pgfnodeparttextbox}}                
-	\pgf@x=0pt
-	\pgf@y=2\pgf@circ@res@step
-	\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
-	\pgf@x=-.5\wd\pgfnodeparttextbox
-	}
-\behindforegroundpath{                             
-	\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen           
-	\pgfscope           
-		\pgfpathmoveto{\pgfpointorigin}
-		\pgfpathlineto{\pgfpoint{0pt}{1.5\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfstartlinewidth=\pgflinewidth
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{.8\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0}{1.5\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{.8\pgf@circ@res@step}}
-		\pgfusepath{draw}
-																						
-		\pgfsetlinewidth{\pgfstartlinewidth}
-
-	\endpgfscope
-}
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@circ@res@step
+        \pgf@y=3\pgf@x%
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0.5\pgf@y\relax}
+    \anchor{south}{\pgfpointorigin}
+    \anchor{west}{\northeast\pgf@y=0.5\pgf@y\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=0pt\relax}
+    \anchor{south west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{center}{\pgfpointorigin}
+    \anchor{text}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+        \pgfpathmoveto{\pgfpoint{-.5\wd\pgfnodeparttextbox}{2\pgf@circ@res@step+2\ht\pgfnodeparttextbox}}
+        \pgfpathmoveto{\pgfpoint{.5\wd\pgfnodeparttextbox}{2\pgf@circ@res@step+2\ht\pgfnodeparttextbox}}
+        \pgf@x=0pt
+        \pgf@y=2\pgf@circ@res@step
+        \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
+        \pgf@x=-.5\wd\pgfnodeparttextbox
+    }
+    \behindforegroundpath{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+        \pgfscope
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathlineto{\pgfpoint{0pt}{1.5\pgf@circ@res@step}}
+            \pgfusepath{draw}
+
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+            \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{0}{1.5\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+            \pgfusepath{draw}
+
+            \pgfsetlinewidth{\pgfstartlinewidth}
+
+        \endpgfscope
+    }
 
 }
 
 % Vee
 \pgfdeclareshape{vee}{
-\anchor{center}{\pgfpointorigin}
-\anchor{text}{
-	\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
-	\pgfpathmoveto{\pgfpoint{-.5\wd\pgfnodeparttextbox}{-2\pgf@circ@res@step-2\ht\pgfnodeparttextbox}}                        
-	\pgfpathmoveto{\pgfpoint{.5\wd\pgfnodeparttextbox}{-2\pgf@circ@res@step-2\ht\pgfnodeparttextbox}}        
-	\pgf@x=0pt
-	\pgf@y=-2\pgf@circ@res@step
-	\advance \pgf@y by -1.5\ht\pgfnodeparttextbox
-	\pgf@x=-.5\wd\pgfnodeparttextbox
-	}
-
-\behindforegroundpath{                             
-	\pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
-	
-	\pgfscope                           
-		\pgfpathmoveto{\pgfpointorigin}
-		\pgfpathlineto{\pgfpoint{0pt}{-1.5\pgf@circ@res@step}}
-		\pgfusepath{draw}
-
-		\pgfstartlinewidth=\pgflinewidth
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-		\pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0}{-1.5\pgf@circ@res@step}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
-		\pgfusepath{draw}
-		\pgfsetlinewidth{\pgfstartlinewidth}
-
-	\endpgfscope
-}
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@circ@res@step
+        \pgf@y=-3\pgf@x%
+    }
+    \anchor{south}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0.5\pgf@y\relax}
+    \anchor{north}{\pgfpointorigin}
+    \anchor{west}{\northeast\pgf@y=0.5\pgf@y\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast}
+    \anchor{south west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast\pgf@y=0pt\relax}
+    \anchor{north west}{\northeast\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{center}{\pgfpointorigin}
+    \anchor{text}{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+        \pgfpathmoveto{\pgfpoint{-.5\wd\pgfnodeparttextbox}{-2\pgf@circ@res@step-2\ht\pgfnodeparttextbox}}
+        \pgfpathmoveto{\pgfpoint{.5\wd\pgfnodeparttextbox}{-2\pgf@circ@res@step-2\ht\pgfnodeparttextbox}}
+        \pgf@x=0pt
+        \pgf@y=-2\pgf@circ@res@step
+        \advance \pgf@y by -1.5\ht\pgfnodeparttextbox
+        \pgf@x=-.5\wd\pgfnodeparttextbox
+    }
+
+    \behindforegroundpath{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/vcc/width}\pgf@circ@Rlen
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathlineto{\pgfpoint{0pt}{-1.5\pgf@circ@res@step}}
+            \pgfusepath{draw}
+
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+            \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{0}{-1.5\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+            \pgfusepath{draw}
+            \pgfsetlinewidth{\pgfstartlinewidth}
+
+        \endpgfscope
+    }
 
 }
 
 
 % match
 \pgfdeclareshape{match}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{text}{
-		\pgf@x=\ctikzvalof{monopoles/match/width}\pgf@circ@Rlen
-		\pgf@x=1.5\pgf@x
-		\advance \pgf@x by -.5\wd\pgfnodeparttextbox
-		\pgf@y=-1.5\ht\pgfnodeparttextbox
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/match/width}\pgf@circ@Rlen
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0pt}}
-			\pgfusepath{draw}
-
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0}}
-			\pgfusepath{fill}
-									
-			\pgfsetlinewidth{\pgfstartlinewidth}
-	
-		\endpgfscope
-	}
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step = \ctikzvalof{monopoles/match/width} \pgf@circ@Rlen
+        \pgf@x=2\pgf@circ@res@step
+        \pgf@circ@res@step = \ctikzvalof{monopoles/match/width} \pgf@circ@Rlen
+        \pgf@y=.5\pgf@circ@res@step%
+    }
+    % the center is on the left side of the shape for facility of usage
+    \anchor{north}{\northeast\pgf@x=0.5\pgf@x\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=0pt\pgf@x=0.5\pgf@x\relax}
+    \anchor{west}{\pgfpointorigin}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=0cm\relax}
+    \anchor{south east}{\northeast\pgf@y=0pt\relax}
+    \anchor{south west}{\pgfpointorigin}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{text}{
+        \pgf@x=\ctikzvalof{monopoles/match/width}\pgf@circ@Rlen
+        \pgf@x=1.5\pgf@x
+        \advance \pgf@x by -.5\wd\pgfnodeparttextbox
+        \pgf@y=-1.5\ht\pgfnodeparttextbox
+    }
+    \behindforegroundpath{
+        \pgf@circ@res@step=\ctikzvalof{monopoles/match/width}\pgf@circ@Rlen
 
-}
+        \pgfscope
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0pt}}
+            \pgfusepath{draw}
 
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{2\pgf@circ@res@step}{0}}
+            \pgfusepath{fill}
+
+            \pgfsetlinewidth{\pgfstartlinewidth}
+
+        \endpgfscope
+    }
+}
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex
new file mode 100644
index 00000000000..48c9c91a9d7
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex
@@ -0,0 +1,559 @@
+% Copyright 2007-2009 by Massimo Redaelli
+% Copyright 2019 by Romano Giannetti
+%
+% This file may be distributed and/or modified
+%
+% 1. under the LaTeX Project Public License and/or
+% 2. under the GNU Public License.
+%
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Multipoles
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% counters for pin accounting...
+\newcount\pgf@circ@count@c
+\newcount\pgf@circ@count@b
+\def\pgf@circ@dip@pin@shift{0.5}
+\def\pgf@circ@qfp@pin@shift{0.25}
+
+% derived from https://tex.stackexchange.com/a/146753/38080
+% original author Mark Wibrow
+% Thanks also to John Kormylo https://tex.stackexchange.com/a/372996/38080
+% a lot of thanks to @marmot  for the un-rotation hint
+% https://tex.stackexchange.com/a/473571/38080
+
+% DIP (dual in line package) chips
+
+\pgfdeclareshape{dipchip}{
+    \savedanchor\centerpoint{%
+        \pgf@x=-.5\wd\pgfnodeparttextbox%
+        \pgf@y=-.5\ht\pgfnodeparttextbox%
+        \advance\pgf@y by+.5\dp\pgfnodeparttextbox%
+    }%
+    \savedanchor\origin{\pgfpoint{0pt}{0pt}}
+    \anchor{center}{\origin}
+    \anchor{text}{\centerpoint}% to adjust text
+    \saveddimen\height{%
+        \pgfmathsetlength\pgf@x{((\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/num pins})
+        *\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/pin spacing})*\pgf@circ@Rlen/2}%
+    }%
+    \saveddimen{\chipspacing}{\pgfmathsetlength\pgf@x{\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/pin spacing}}}
+    \saveddimen{\width}{\pgfmathsetlength\pgf@x{\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/width}}}
+    \saveddimen{\extshift}{\pgfmathsetlength\pgf@x{\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins width}}}
+    % standard anchors
+    \savedanchor\northwest{%
+        \pgfmathsetlength\pgf@y{0.5*((\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/num pins})
+        *\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/pin spacing})*\pgf@circ@Rlen/2}%
+        \pgfmathsetlength\pgf@x{-0.5*\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/width}}
+    }
+    \anchor{dot}{\northwest
+        \pgfmathsetlength\pgf@x{\pgf@x + 0.3*\chipspacing}
+        \pgfmathsetlength\pgf@y{\pgf@y - 0.3*\chipspacing}
+    }
+    \anchor{nw}{\northwest}
+    \anchor{ne}{\northwest\pgf@x=-\pgf@x}
+    \anchor{se}{\northwest\pgf@x=-\pgf@x\pgf@y=-\pgf@y}
+    \anchor{sw}{\northwest\pgf@y=-\pgf@y}
+    \anchor{north west}{\northwest}
+    \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+    \anchor{south east}{\northwest\pgf@x=-\pgf@x \pgf@y=-\pgf@y}
+    \anchor{south west}{\northwest\pgf@y=-\pgf@y}
+    \anchor{n}{\northwest\pgf@x=0pt }
+    \anchor{e}{\northwest\pgf@x=-\pgf@x\pgf@y=0pt }
+    \anchor{s}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{w}{\northwest\pgf@y=0pt }
+    \anchor{north}{\northwest\pgf@x=0pt }
+    \anchor{east}{\northwest\pgf@x=-\pgf@x\pgf@y=0pt }
+    \anchor{south}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{west}{\northwest\pgf@y=0pt }
+    % start drawing
+    \backgroundpath{%
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/pin spacing}\pgf@circ@Rlen
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins width}\pgf@circ@Rlen
+        \pgfscope% (for the line width)
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/multipoles/thickness}\pgflinewidth}
+        \pgfpathrectanglecorners{\pgfpoint{-\width/2}{-\height/2}}{\pgfpoint{\width/2}{\height/2}}%
+        \pgf@circ@draworfill
+        %% upside mark
+        \ifpgf@circuit@chip@topmark
+            \pgfpathmoveto{\pgfpoint{0.2*\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpatharc{0}{180}{0.2*\pgf@circ@res@left}
+        \fi
+        \pgfusepath{stroke}%
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        % Adding the pin number
+        \ifpgf@circuit@chip@shownumbers
+            \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/num pins}%
+            \divide\c@pgf@counta by 2 \pgf@circ@count@b=\c@pgf@counta
+            % thanks to @marmot: https://tex.stackexchange.com/a/473571/38080
+            \ifpgf@circuit@chip@straightnumbers
+                \pgfgettransformentries\a\b\temp\temp\temp\temp
+                \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+                \pgfmathtruncatemacro{\quadrant}{mod(4+int(360+(\rot+45)/90),4)}
+            \else
+                \pgfmathsetmacro{\rot}{0}
+                \pgfmathsetmacro{\quadrant}{0}
+            \fi
+            \def\pgf@circ@strut{\vrule width 0pt height 1em depth 0.4em\relax}
+            \def\mytext{\pgfkeysvalueof{/tikz/circuitikz/multipoles/font}\space\pgf@circ@strut\the\pgf@circ@count@c\space}
+            \pgfmathloop%
+            \ifnum\c@pgf@counta>0
+                \ifcase\quadrant % rotation 0
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                \or % rotation -90
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                \or %rotation 180
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                \or % rotation +90
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                \fi
+                \advance\c@pgf@counta-1\relax%
+                \repeatpgfmathloop
+            \fi
+            \endpgfscope
+            \ifdim\pgf@circ@res@other>0pt
+            \pgfscope
+                \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins thickness}\pgflinewidth}
+                \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/num pins}%
+                \divide\c@pgf@counta by 2 \pgf@circ@count@b=\c@pgf@counta
+                \pgfmathloop%
+                \ifnum\c@pgf@counta>0
+                    \edef\padfrac{\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pad fraction}}
+                    \ifnum\padfrac>0
+                        \pgf@circ@res@temp=\pgf@circ@res@step\divide\pgf@circ@res@temp by \padfrac
+                        % left side pads
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % right side pads
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                    \else
+                        % left side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % right side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{\pgf@circ@res@up+(\pgf@circ@dip@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                    \fi
+                    \advance\c@pgf@counta by -1\relax%
+                \repeatpgfmathloop
+                \pgfusepath{stroke}
+            \endpgfscope
+            \fi
+        }%
+        % \pgf@sh@s@<name of the shape here> contains all the code for the shape
+        % and is executed just before a node is drawn.
+        \pgfutil@g@addto@macro\pgf@sh@s@dipchip{%
+            % Start with the maximum pin number and go backwards.
+            % If the anchor is undefined, create it. Otherwise stop.
+            \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/dipchip/num pins}%
+            \divide\c@pgf@counta by 2 \pgf@circ@count@b=\c@pgf@counta
+            \pgfmathloop%
+            \ifnum\c@pgf@counta>0
+                % left side, pins 1..npins/2
+                % we will create two anchors per pin: the "normal one" like `pin 1` for the
+                % electrical contact, and the "border one" like `bpin 1` for labels.
+                % they will coincide if `external pins width` is set to 0.
+                \expandafter\xdef\csname pgf@anchor@dipchip@bpin\space\the\c@pgf@counta\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorLB{\the\c@pgf@counta}%
+                }
+                \expandafter\xdef\csname pgf@anchor@dipchip@pin\space\the\c@pgf@counta\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorL{\the\c@pgf@counta}%
+                }
+                % right side
+                \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                \expandafter\xdef\csname pgf@anchor@dipchip@bpin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorRB{\the\c@pgf@counta}%
+                }%
+                \expandafter\xdef\csname pgf@anchor@dipchip@pin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorR{\the\c@pgf@counta}%
+                }%
+                \advance\c@pgf@counta by -1\relax%
+                \repeatpgfmathloop%
+            }%
+        }
+
+% QFP (quad flat package) chips
+
+\pgfdeclareshape{qfpchip}{
+    \savedanchor\centerpoint{%
+        \pgf@x=-.5\wd\pgfnodeparttextbox%
+        \pgf@y=-.5\ht\pgfnodeparttextbox%
+        \advance\pgf@y by+.5\dp\pgfnodeparttextbox%
+    }%
+    \savedanchor\origin{\pgfpoint{0pt}{0pt}}
+    \anchor{center}{\origin}
+    \anchor{text}{\centerpoint}% to adjust text
+    \saveddimen\height{%
+        \pgfmathsetlength\pgf@x{((\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}+2)
+        *\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/pin spacing})*\pgf@circ@Rlen/4}%
+    }%
+    \saveddimen\width{%
+        \pgfmathsetlength\pgf@x{((\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}+2)
+        *\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/pin spacing})*\pgf@circ@Rlen/4}%
+    }%
+    \saveddimen{\chipspacing}{\pgfmathsetlength\pgf@x{\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/pin spacing}}}
+    \saveddimen{\extshift}{\pgfmathsetlength\pgf@x{\pgf@circ@Rlen*\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins width}}}
+    % standard anchors
+    \savedanchor\northwest{%
+        \pgfmathsetlength\pgf@y{0.5*((\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}+2)
+        *\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/pin spacing})*\pgf@circ@Rlen/4}%
+        \pgf@x=-\pgf@y
+    }
+    \anchor{dot}{\northwest
+        \pgfmathsetlength\pgf@x{\pgf@x + 0.3*\chipspacing}
+        \pgfmathsetlength\pgf@y{\pgf@y - 0.3*\chipspacing}
+    }
+    \anchor{nw}{\northwest}
+    \anchor{ne}{\northwest\pgf@x=-\pgf@x}
+    \anchor{se}{\northwest\pgf@x=-\pgf@x\pgf@y=-\pgf@y}
+    \anchor{sw}{\northwest\pgf@y=-\pgf@y}
+    \anchor{north west}{\northwest}
+    \anchor{north east}{\northwest\pgf@x=-\pgf@x}
+    \anchor{south east}{\northwest\pgf@x=-\pgf@x \pgf@y=-\pgf@y}
+    \anchor{south west}{\northwest\pgf@y=-\pgf@y}
+    \anchor{n}{\northwest\pgf@x=0pt }
+    \anchor{e}{\northwest\pgf@x=-\pgf@x\pgf@y=0pt }
+    \anchor{s}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{w}{\northwest\pgf@y=0pt }
+    \anchor{north}{\northwest\pgf@x=0pt }
+    \anchor{east}{\northwest\pgf@x=-\pgf@x\pgf@y=0pt }
+    \anchor{south}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{west}{\northwest\pgf@y=0pt }
+    % start drawing
+    \backgroundpath{%
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/pin spacing}\pgf@circ@Rlen
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins width}\pgf@circ@Rlen
+        \pgfscope% (for the line width)
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/multipoles/thickness}\pgflinewidth}
+        %% upside mark
+        \ifpgf@circuit@chip@topmark
+            \pgfpathmoveto{\pgfpoint{-\width/2}{\height/2-\pgf@circ@res@step/2}}
+            \pgfpathlineto{\pgfpoint{-\width/2+\pgf@circ@res@step/2}{\height/2}}
+        \else
+            \pgfpathmoveto{\pgfpoint{-\width/2}{\height/2}}
+        \fi
+        %% rest of the shape
+        \pgfpathlineto{\pgfpoint{\width/2}{\height/2}}
+        \pgfpathlineto{\pgfpoint{\width/2}{-\height/2}}
+        \pgfpathlineto{\pgfpoint{-\width/2}{-\height/2}}
+        \pgfpathclose
+        \pgf@circ@draworfill
+        % Adding the pin number
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \ifpgf@circuit@chip@shownumbers
+            \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}%
+            \divide\c@pgf@counta by 4 \pgf@circ@count@b=\c@pgf@counta
+            % thanks to @marmot: https://tex.stackexchange.com/a/473571/38080
+            \ifpgf@circuit@chip@straightnumbers
+                \pgfgettransformentries\a\b\temp\temp\temp\temp
+                \pgfmathsetmacro{\rot}{-atan2(\b,\a)}
+                \pgfmathtruncatemacro{\quadrant}{mod(4+int(360+(\rot+45)/90),4)}
+            \else
+                \pgfmathsetmacro{\rot}{0}
+                \pgfmathsetmacro{\quadrant}{0}
+            \fi
+            \def\pgf@circ@strut{\vrule width 0pt height 1em depth 0.4em\relax}
+            \def\mytext{\pgfkeysvalueof{/tikz/circuitikz/multipoles/font}\space\pgf@circ@strut\the\pgf@circ@count@c\space}
+            \pgfmathloop%
+            \ifnum\c@pgf@counta>0
+                \ifcase\quadrant % rotation 0
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % bottom
+                    \pgf@circ@count@c=\numexpr\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % top
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up},
+                        rotate=\rot]{\mytext}
+                \or % rotation -90
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % bottom
+                    \pgf@circ@count@c=\numexpr\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % top
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up},
+                        rotate=\rot]{\mytext}
+                \or %rotation 180
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % bottom
+                    \pgf@circ@count@c=\numexpr\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % top
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up},
+                        rotate=\rot]{\mytext}
+                \or % rotation +90
+                    % left
+                    \pgf@circ@count@c=\c@pgf@counta
+                    \pgftext[bottom,
+                        at=\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % bottom
+                    \pgf@circ@count@c=\numexpr\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[right,
+                        at=\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down},
+                        rotate=\rot]{\mytext}
+                    % right
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                    \pgftext[top,
+                        at=\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step},
+                        rotate=\rot]{\mytext}
+                    % top
+                    \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b+\c@pgf@counta\relax
+                    \pgftext[left,
+                        at=\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up},
+                        rotate=\rot]{\mytext}
+                \fi
+                \advance\c@pgf@counta-1\relax%
+                \repeatpgfmathloop
+            \fi
+            \endpgfscope
+            \ifdim\pgf@circ@res@other>0pt
+            \pgfscope
+                \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pins thickness}\pgflinewidth}
+                \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}%
+                \divide\c@pgf@counta by 4 \pgf@circ@count@b=\c@pgf@counta
+                \pgfmathloop%
+                \ifnum\c@pgf@counta>0
+                    \edef\padfrac{\pgfkeysvalueof{/tikz/circuitikz/multipoles/external pad fraction}}
+                    \ifnum\padfrac>0
+                        \pgf@circ@res@temp=\pgf@circ@res@step\divide\pgf@circ@res@temp by \padfrac
+                        % left side pads
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % bottom side pads
+                        \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@temp+\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down}}
+                        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@temp+\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down-\pgf@circ@res@other}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@temp+\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down-\pgf@circ@res@other}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@temp+\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down}}
+                        % right side pads
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-\pgf@circ@res@temp+\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % top side pads
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@temp+\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@temp+\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up+\pgf@circ@res@other}}
+                        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@temp+\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up+\pgf@circ@res@other}}
+                        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@temp+\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up}}
+                    \else
+                        % left side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@other}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % bottom side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@down-\pgf@circ@res@other}}
+                        % right side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgf@circ@res@other}{\pgf@circ@res@up+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}}
+                        % top side pins
+                        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up}}
+                        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+(\pgf@circ@qfp@pin@shift-\the\c@pgf@counta)*\pgf@circ@res@step}{\pgf@circ@res@up+\pgf@circ@res@other}}
+                    \fi
+                    \advance\c@pgf@counta-1\relax%
+                \repeatpgfmathloop
+                \pgfusepath{stroke}
+            \endpgfscope
+            \fi
+        }%
+        % \pgf@sh@s@<name of the shape here> contains all the code for the shape
+        % and is executed just before a node is drawn.
+        \pgfutil@g@addto@macro\pgf@sh@s@qfpchip{%
+            % Start with the maximum pin number and go backwards.
+            % If the anchor is undefined, create it. Otherwise stop.
+            \c@pgf@counta=\pgfkeysvalueof{/tikz/circuitikz/multipoles/qfpchip/num pins}%
+            \divide\c@pgf@counta by 4 \pgf@circ@count@b=\c@pgf@counta
+            \pgfmathloop%
+            \ifnum\c@pgf@counta>0
+                % left side; 1..npins/4
+                \expandafter\xdef\csname pgf@anchor@qfpchip@pin\space\the\c@pgf@counta\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQL{\the\c@pgf@counta}%
+                }
+                \expandafter\xdef\csname pgf@anchor@qfpchip@bpin\space\the\c@pgf@counta\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQLB{\the\c@pgf@counta}%
+                }
+                % bottom side;
+                \pgf@circ@count@c=\numexpr2*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                \expandafter\xdef\csname pgf@anchor@qfpchip@pin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQB{\the\c@pgf@counta}%
+                }
+                \expandafter\xdef\csname pgf@anchor@qfpchip@bpin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQBB{\the\c@pgf@counta}%
+                }
+                % right side; 2*npins/4+1, 3*npins/4
+                \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b-\c@pgf@counta+1\relax
+                \expandafter\xdef\csname pgf@anchor@qfpchip@pin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQR{\the\c@pgf@counta}%
+                }
+                \expandafter\xdef\csname pgf@anchor@qfpchip@bpin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQRB{\the\c@pgf@counta}%
+                }
+                % top side
+                \pgf@circ@count@c=\numexpr3*\pgf@circ@count@b+\c@pgf@counta\relax
+                \expandafter\xdef\csname pgf@anchor@qfpchip@pin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQT{\the\c@pgf@counta}%
+                }
+                \expandafter\xdef\csname pgf@anchor@qfpchip@bpin\space\the\pgf@circ@count@c\endcsname{%
+                    \noexpand\pgf@circ@chippinanchorQTB{\the\c@pgf@counta}%
+                }
+                \advance\c@pgf@counta-1\relax%
+                \repeatpgfmathloop%
+            }%
+        }
+
+%% anchors for DIP
+\def\pgf@circ@chippinanchorR#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+\extshift}{\height/2+(\pgf@circ@dip@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorL#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{-\width/2-\extshift}{\height/2+(\pgf@circ@dip@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorRB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2}{\height/2+(\pgf@circ@dip@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorLB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{-\width/2}{\height/2+(\pgf@circ@dip@pin@shift-#1)*\chipspacing}%
+}
+
+%% anchors for QFP
+\def\pgf@circ@chippinanchorQR#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+\extshift}{\height/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorQL#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{-\width/2-\extshift}{\height/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorQT#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}{\height/2+\extshift}%
+}
+\def\pgf@circ@chippinanchorQB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}{-\height/2-\extshift}%
+}
+\def\pgf@circ@chippinanchorQRB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2}{\height/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorQLB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{-\width/2}{\height/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}%
+}
+\def\pgf@circ@chippinanchorQTB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}{\height/2}%
+}
+\def\pgf@circ@chippinanchorQBB#1{%
+  % When this macro is called,
+  % \extshift, \height and \chipspacing will be defined.
+    \pgfpoint{\width/2+(\pgf@circ@qfp@pin@shift-#1)*\chipspacing}{-\height/2}%
+}
+
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
index 44fa367b4ce..cb1c15022bd 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
@@ -3,7 +3,7 @@
 
 % Names
 \ctikzset{name/.style = { n=#1 } } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%@@@
-\ctikzset{n/.code = { 
+\ctikzset{n/.code = {
 	\pgfkeys{/tikz/circuitikz/bipole/name=#1}
 }}
 
@@ -33,130 +33,124 @@
 
 % Initialize paths
 \def\pgfcircresetpath{
-	\ctikzset{bipole/name=, bipole/label/name=, bipole/label/position=90, ,bipole/annotation/name=, bipole/annotation/position=-90, 
-		bipole/inverted=false, bipole/kind=,
-	  	bipole/voltage/direction=backward, bipole/voltage/label/name=, bipole/voltage/position=below,
-	  	bipole/nodes/left=none, bipole/nodes/right=none, bipole/is voltage=false,bipole/is voltageoutsideofsymbol=false,bipole/is strokedsymbol=false,
-		bipole/is current=false, bipole/current/label/name=, bipole/current/x position=after,
-		bipole/current/y position=above, bipole/current/direction=forward, 
-		mirrored=false
-   }
+    \ctikzset{bipole/name=, bipole/label/name=, bipole/label/position=90, ,bipole/annotation/name=, bipole/annotation/position=-90,
+        bipole/inverted=false, bipole/kind=,
+        bipole/voltage/direction=backward, bipole/voltage/label/name=, bipole/voltage/position=below,
+        bipole/nodes/left=none, bipole/nodes/right=none, bipole/is voltage=false,bipole/is voltageoutsideofsymbol=false,bipole/is strokedsymbol=false,
+        bipole/is current=false, bipole/current/label/name=, bipole/current/x position=after,
+        bipole/current/y position=above, bipole/current/direction=forward,
+        mirrored=false
+    }
 }
 
 %% Helper function for path-function to ensure using anchors between nodes
 \def\set@explicit@center@anchor#1{
-	\pgfutil@ifundefined{pgf@sh@ns@#1}
-	{
-	%This coordinate is no node(but a relative position or a coordinate), no further handling needed
-	}{
-	\pgfutil@in@.{#1}
-	\ifpgfutil@in@
-	% Anchor is used, do nothing!
-	\else%
-		\let\tikz@moveto@waiting=\relax
-		\pgfpathmoveto{\tikz@last@position}%force movement, because tikz@moveto@waiting
-		\edef#1{#1.center}%ensure using center anchor
-	\fi
-	}
+    \pgfutil@ifundefined{pgf@sh@ns@#1}
+    {
+        %This coordinate is no node(but a relative position or a coordinate), no further handling needed
+        }{
+        \pgfutil@in@.{#1}
+        \ifpgfutil@in@
+            % Anchor is used, do nothing!
+    \else%
+        \let\tikz@moveto@waiting=\relax
+        \pgfpathmoveto{\tikz@last@position}%force movement, because tikz@moveto@waiting
+        \edef#1{#1.center}%ensure using center anchor
+    \fi
+}
 }
 
 
 %% Generic bipole path
 \def\pgf@circ@bipole@path#1#2{
 
-\pgfextra{
-		\set@explicit@center@anchor{\tikztostart}
-		\set@explicit@center@anchor{\tikztotarget}
-		\pgfsyssoftpath@getcurrentpath{\myp@th}%% save current path to extend after calculation of correct start/end coordinates
-		\ctikzset{bipole/kind = #1}
-		\edef\pgf@temp{\ctikzvalof{bipole/name}}
-		\def\pgf@circ@temp{}
-		\ifx\pgf@temp\pgf@circ@temp % if it has not a name
-			\pgfmathrandominteger{\pgf@circ@rand}{1000}{9999}
-			\ctikzset{bipole/name = #2\pgf@circ@rand} % create it
-		\fi
-	}
-	
-		(\tikztostart) coordinate (\ctikzvalof{bipole/name}start)%necessary to get correct coordinates in the case of relativ start/end or constructions like ((node1)-|(node2))
-		(\tikztotarget) coordinate (\ctikzvalof{bipole/name}end)
-		\pgfextra{
-			\pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
-							{\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}}
-			\edef\pgf@circ@direction{\pgfmathresult}%Calculate direction(angle) of path
-			\pgfsyssoftpath@setcurrentpath{\myp@th}		
-		}
-	\pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
-	\ifx\pgf@temp\pgf@circ@temp  % if it is an open
-	\else
-		--($(\ctikzvalof{bipole/name}start) ! .5\pgflinewidth ! (\ctikzvalof{bipole/name}end)$) %ugly workaround to get correct linejoins(node breaks path?)
-	\fi
-		($(\tikztostart) ! .5 ! (\tikztotarget)$)%%positio of middle node 
-		node[#1shape, rotate=\pgf@circ@direction, yscale=\ctikzvalof{mirror value}, xscale=\ctikzvalof{invert value}] 
-			(\ctikzvalof{bipole/name}) {}
-			\ifpgf@circuit@bipole@inverted
-				\ifcsname pgf@anchor@#1shape@pathstart\endcsname%if special path-anchors are defined, use them!
-					coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.pathend)
-					coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.pathstart)
-				\else
-					coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.right)
-					coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.left)
-				\fi
-			\else
-				\ifcsname pgf@anchor@#1shape@pathstart\endcsname%if special path-anchors are defined, use them!
-					coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.pathstart)
-					coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.pathend)
-				\else
-					coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.left)
-					coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.right)
-				\fi
-			\fi
-	\pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
-	\ifx\pgf@temp\pgf@circ@temp  % if it is an open
-	\else
-		\ifpgf@circuit@bipole@strokedsymbol%draw line thrue symbol(e.g. diodes)
-			\ifcsname pgf@anchor@#1shape@strokepathstart\endcsname%if special path-anchors are defined, use them!
-				(\ctikzvalof{bipole/name}start.center) -- (\ctikzvalof{bipole/name}.strokepathstart)
-				(\ctikzvalof{bipole/name}.strokepathend)  -- (\ctikzvalof{bipole/name}end.center)
-			\else
-				(\ctikzvalof{bipole/name}start.center) -- (\ctikzvalof{bipole/name}end.center)
-			\fi
-		\else		
-			(\ctikzvalof{bipole/name}start.center) -- (anchorstartnode)
-			(anchorendnode)  -- (\ctikzvalof{bipole/name}end.center)
-		\fi
-	\fi
-	
-	\drawpoles
-	\pgf@circ@ifkeyempty{bipole/label/name}\else\pgf@circ@drawlabels{label}\fi
-	\pgf@circ@ifkeyempty{bipole/annotation/name}\else\pgf@circ@drawlabels{annotation}\fi
-	\pgf@circ@ifkeyempty{bipole/voltage/label/name}\else\pgf@circ@drawvoltage\fi
-	\pgf@circ@ifkeyempty{bipole/current/label/name}\else\pgf@circ@drawcurrent\fi
-	\pgf@circ@ifkeyempty{bipole/flow/label/name}\else\pgf@circ@drawflow\fi
-	\pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
-	\ifx\pgf@temp\pgf@circ@temp  % if it is an open
-		(\ctikzvalof{bipole/name}end)%Move to end of path
-	\else
-		($(\ctikzvalof{bipole/name}end) ! .5\pgflinewidth ! (\ctikzvalof{bipole/name}start)$) -- (\ctikzvalof{bipole/name}end)%ugly workaround to get correct linejoins(node breaks path?)
-		%tikztostart and tikztotarget could not be used, because it would break if target coordinate is something like (node1-|node2)
-		
-	\fi
-	% reset
-	\pgfextra{
-		\pgfcircresetpath
-	}  
-	\tikztonodes%draw pending nodes an path
+    \pgfextra{
+        \set@explicit@center@anchor{\tikztostart}
+        \set@explicit@center@anchor{\tikztotarget}
+        \pgfsyssoftpath@getcurrentpath{\myp@th}%% save current path to extend after calculation of correct start/end coordinates
+        \ctikzset{bipole/kind = #1}
+        \edef\pgf@temp{\ctikzvalof{bipole/name}}
+        \def\pgf@circ@temp{}
+        \ifx\pgf@temp\pgf@circ@temp % if it has not a name
+            \pgfmathrandominteger{\pgf@circ@rand}{1000}{9999}
+            \ctikzset{bipole/name = #2\pgf@circ@rand} % create it
+        \fi
+    }
+
+    (\tikztostart) coordinate (\ctikzvalof{bipole/name}start)%necessary to get correct coordinates in the case of relative start/end or constructions like ((node1)-|(node2))
+    (\tikztotarget) coordinate (\ctikzvalof{bipole/name}end)
+    \pgfextra{
+        \pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
+        {\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}}
+        \pgfmathround{\pgfmathresult}
+        \edef\pgf@circ@direction{\pgfmathresult}%Calculate direction(angle) of path
+        \pgfsyssoftpath@setcurrentpath{\myp@th}
+    }
+    \pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
+    \ifx\pgf@temp\pgf@circ@temp  % if it is an open
+        \else
+            --($(\ctikzvalof{bipole/name}start) ! .5\pgflinewidth ! (\ctikzvalof{bipole/name}end)$) %ugly workaround to get correct linejoins(node breaks path?)
+        \fi
+        ($(\tikztostart) ! .5 ! (\tikztotarget)$)%%positio of middle node
+        node[#1shape, rotate=\pgf@circ@direction, yscale=\ctikzvalof{mirror value}, xscale=\ctikzvalof{invert value}]
+        (\ctikzvalof{bipole/name}) {}
+        \ifpgf@circuit@bipole@inverted
+            \ifcsname pgf@anchor@#1shape@pathstart\endcsname%if special path-anchors are defined, use them!
+                coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.pathend)
+                coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.pathstart)
+            \else
+                coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.right)
+                coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.left)
+            \fi
+            \else
+            \ifcsname pgf@anchor@#1shape@pathstart\endcsname%if special path-anchors are defined, use them!
+                coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.pathstart)
+                coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.pathend)
+            \else
+                coordinate	(anchorstartnode) at (\ctikzvalof{bipole/name}.left)
+                coordinate	(anchorendnode) at (\ctikzvalof{bipole/name}.right)
+            \fi
+        \fi
+        \pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
+        \ifx\pgf@temp\pgf@circ@temp  % if it is an open
+        \else
+            (\ctikzvalof{bipole/name}start.center) -- (anchorstartnode)
+            (anchorendnode)  -- (\ctikzvalof{bipole/name}end.center)
+        \fi
+
+        \drawpoles
+        \pgf@circ@ifkeyempty{bipole/label/name}\else\pgf@circ@drawlabels{label}\fi
+        \pgf@circ@ifkeyempty{bipole/annotation/name}\else\pgf@circ@drawlabels{annotation}\fi
+        \pgf@circ@ifkeyempty{bipole/voltage/label/name}\else\pgf@circ@drawvoltage\fi
+        \pgf@circ@ifkeyempty{bipole/current/label/name}\else\pgf@circ@drawcurrent\fi
+        \pgf@circ@ifkeyempty{bipole/flow/label/name}\else\pgf@circ@drawflow\fi
+        \pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#1}}
+        \ifx\pgf@temp\pgf@circ@temp  % if it is an open
+            (\ctikzvalof{bipole/name}end)%Move to end of path
+        \else
+            ($(\ctikzvalof{bipole/name}end) ! .5\pgflinewidth ! (\ctikzvalof{bipole/name}start)$) -- (\ctikzvalof{bipole/name}end)%ugly workaround to get correct linejoins(node breaks path?)
+            %tikztostart and tikztotarget could not be used, because it would break if target coordinate is something like (node1-|node2)
+
+        \fi
+    % reset
+    \pgfextra{
+        \pgfcircresetpath
+    }
+    \tikztonodes%draw pending nodes an path
 }
 
 
 %% Path definitions
 \def\pgf@circ@resistor@path#1{\ifpgf@circuit@europeanresistor\pgf@circ@bipole@path{generic}{#1}\else\pgf@circ@bipole@path{resistor}{#1}\fi}
 \def\pgf@circ@vresistor@path#1{\ifpgf@circuit@europeanresistor\pgf@circ@bipole@path{tgeneric}{#1}\else\pgf@circ@bipole@path{vresistor}{#1}\fi}
+\def\pgf@circ@sresistor@path#1{\ifpgf@circuit@europeanresistor\pgf@circ@bipole@path{thermistor}{#1}\else\pgf@circ@bipole@path{resistivesens}{#1}\fi}
 \def\pgf@circ@potentiometer@path#1{\ifpgf@circuit@europeanresistor\pgf@circ@bipole@path{genericpotentiometer}{#1}\else\pgf@circ@bipole@path{potentiometer}{#1}\fi}
 \def\pgf@circ@thermistor@path#1{\pgf@circ@bipole@path{thermistor}{#1}}
 \def\pgf@circ@thermistorptc@path#1{\pgf@circ@bipole@path{thermistorptc}{#1}}
 \def\pgf@circ@thermistorntc@path#1{\pgf@circ@bipole@path{thermistorntc}{#1}}
 \def\pgf@circ@varistor@path#1{\pgf@circ@bipole@path{varistor}{#1}}
 \def\pgf@circ@capacitor@path#1{\pgf@circ@bipole@path{capacitor}{#1}}
+\def\pgf@circ@capacitivesens@path#1{\pgf@circ@bipole@path{capacitivesens}{#1}}
 \def\pgf@circ@ecapacitor@path#1{\pgf@circ@bipole@path{ecapacitor}{#1}}
 \def\pgf@circ@polarcapacitor@path#1{\pgf@circ@bipole@path{polarcapacitor}{#1}}
 \def\pgf@circ@vcapacitor@path#1{\pgf@circ@bipole@path{vcapacitor}{#1}}
@@ -167,42 +161,63 @@
 \def\pgf@circ@europeaninductor@path#1{\pgf@circ@bipole@path{fullgeneric}{#1}}
 \def\pgf@circ@americaninductor@path#1{\pgf@circ@bipole@path{americaninductor}{#1}}
 \def\pgf@circ@cuteinductor@path#1{\pgf@circ@bipole@path{cuteinductor}{#1}}
+\def\pgf@circ@cutechoke@path#1{\pgf@circ@bipole@path{cutechoke}{#1}}
 \def\pgf@circ@inductor@path#1{%
-	\pgfextra{
-		\edef\pgf@circ@temp{\ctikzvalof{inductor}}%
-		\def\pgf@temp{european}%
-	}
-	\ifx\pgf@temp\pgf@circ@temp%
-		\pgf@circ@europeaninductor@path{#1}%
-	\else%
-		\pgfextra{	\def\pgf@temp{cute} }%
-		\ifx\pgf@temp\pgf@circ@temp%
-			\pgf@circ@cuteinductor@path{#1}%
-		\else%
-			\pgf@circ@americaninductor@path{#1}%
-		\fi%
-	\fi%
+    \pgfextra{
+        \edef\pgf@circ@temp{\ctikzvalof{inductor}}%
+        \def\pgf@temp{european}%
+    }
+    \ifx\pgf@temp\pgf@circ@temp%
+        \pgf@circ@europeaninductor@path{#1}%
+    \else%
+        \pgfextra{	\def\pgf@temp{cute} }%
+        \ifx\pgf@temp\pgf@circ@temp%
+            \pgf@circ@cuteinductor@path{#1}%
+        \else%
+            \pgf@circ@americaninductor@path{#1}%
+        \fi%
+    \fi%
 }
 \def\pgf@circ@vinductor@path#1{
-	\pgfextra{
-		\edef\pgf@circ@temp{\ctikzvalof{inductor}}%
-		\def\pgf@temp{european}%
-	}
-	\ifx\pgf@temp\pgf@circ@temp%
-		\pgf@circ@veuropeaninductor@path{#1}%
-	\else%
-		\pgfextra{	\def\pgf@temp{cute} }%
-		\ifx\pgf@temp\pgf@circ@temp%
-			\pgf@circ@vcuteinductor@path{#1}%
-		\else%
-			\pgf@circ@vamericaninductor@path{#1}%
-		\fi%
-	\fi%
+    \pgfextra{
+        \edef\pgf@circ@temp{\ctikzvalof{inductor}}%
+        \def\pgf@temp{european}%
+    }
+    \ifx\pgf@temp\pgf@circ@temp%
+        \pgf@circ@veuropeaninductor@path{#1}%
+    \else%
+        \pgfextra{	\def\pgf@temp{cute} }%
+        \ifx\pgf@temp\pgf@circ@temp%
+            \pgf@circ@vcuteinductor@path{#1}%
+        \else%
+            \pgf@circ@vamericaninductor@path{#1}%
+        \fi%
+    \fi%
+}
+\def\pgf@circ@inductivesens@path#1{%
+    \pgfextra{
+        \edef\pgf@circ@temp{\ctikzvalof{inductor}}%
+        \def\pgf@temp{european}%
+    }
+    \ifx\pgf@temp\pgf@circ@temp%
+        \pgf@circ@europeaninductivesens@path{#1}%
+    \else%
+        \pgfextra{	\def\pgf@temp{cute} }%
+        \ifx\pgf@temp\pgf@circ@temp%
+            \pgf@circ@cuteinductivesens@path{#1}%
+        \else%
+            \pgf@circ@americaninductivesens@path{#1}%
+        \fi%
+    \fi%
 }
 \def\pgf@circ@veuropeaninductor@path#1{\pgf@circ@bipole@path{tfullgeneric}{#1}}
 \def\pgf@circ@vamericaninductor@path#1{\pgf@circ@bipole@path{vamericaninductor}{#1}}
 \def\pgf@circ@vcuteinductor@path#1{\pgf@circ@bipole@path{vcuteinductor}{#1}}
+\def\pgf@circ@europeaninductivesens@path#1{\pgf@circ@bipole@path{sfullgeneric}{#1}}
+\def\pgf@circ@americaninductivesens@path#1{\pgf@circ@bipole@path{samericaninductor}{#1}}
+\def\pgf@circ@cuteinductivesens@path#1{\pgf@circ@bipole@path{scuteinductor}{#1}}
 \def\pgf@circ@lamp@path#1{\pgf@circ@bipole@path{lamp}{#1}}
+\def\pgf@circ@bulb@path#1{\pgf@circ@bipole@path{bulb}{#1}}
 \def\pgf@circ@esource@path#1{\pgf@circ@bipole@path{esource}{#1}}
 \def\pgf@circ@pvsource@path#1{\pgf@circ@bipole@path{pvsource}{#1}}
 \def\pgf@circ@vsource@path#1{\pgf@circ@bipole@path{vsource}{#1}}
@@ -228,6 +243,7 @@
 \def\pgf@circ@nos@path#1{\pgf@circ@bipole@path{nos}{#1}}
 \def\pgf@circ@ncs@path#1{\pgf@circ@bipole@path{ncs}{#1}}
 \def\pgf@circ@pushbutton@path#1{\pgf@circ@bipole@path{pushbutton}{#1}}
+\def\pgf@circ@ncpushbutton@path#1{\pgf@circ@bipole@path{ncpushbutton}{#1}}
 \def\pgf@circ@open@path#1{\pgf@circ@bipole@path{open}{#1}}
 \def\pgf@circ@generic@path#1{\pgf@circ@bipole@path{generic}{#1}}
 \def\pgf@circ@ageneric@path#1{\pgf@circ@bipole@path{ageneric}{#1}}
@@ -237,6 +253,7 @@
 \def\pgf@circ@ammeter@path#1{\pgf@circ@bipole@path{ammeter}{#1}}
 \def\pgf@circ@ohmmeter@path#1{\pgf@circ@bipole@path{ohmmeter}{#1}}
 \def\pgf@circ@voltmeter@path#1{\pgf@circ@bipole@path{voltmeter}{#1}}
+\def\pgf@circ@oscope@path#1{\pgf@circ@bipole@path{oscope}{#1}}
 \def\pgf@circ@empty@path#1{}
 \def\pgf@circ@photoresistor@path#1{\pgf@circ@bipole@path{photoresistor}{#1}}
 \def\pgf@circ@emptythyristor@path#1{\pgf@circ@bipole@path{emptythyristor}{#1}}
@@ -246,6 +263,7 @@
 \def\pgf@circ@emptytriac@path#1{\pgf@circ@bipole@path{emptytriac}{#1}}
 \def\pgf@circ@fulltriac@path#1{\pgf@circ@bipole@path{fulltriac}{#1}}
 \def\pgf@circ@tline@path#1{\pgf@circ@bipole@path{tline}{#1}}
+\def\pgf@circ@mstline@path#1{\pgf@circ@bipole@path{mstline}{#1}}
 \def\pgf@circ@squid@path#1{\pgf@circ@bipole@path{squid}{#1}}
 \def\pgf@circ@barrier@path#1{\pgf@circ@bipole@path{barrier}{#1}}
 \def\pgf@circ@thermocouple@path#1{\pgf@circ@bipole@path{thermocouple}{#1}}
@@ -280,9 +298,7 @@
 \def\pgf@circ@spring@path#1{\pgf@circ@bipole@path{spring}{#1}}
 \def\pgf@circ@mass@path#1{\pgf@circ@bipole@path{mass}{#1}}
 \def\pgf@circ@damper@path#1{\pgf@circ@bipole@path{damper}{#1}}
-
-
-
+\def\pgf@circ@viscoe@path#1{\pgf@circ@bipole@path{viscoe}{#1}}
 
 %% Styles
 
@@ -296,6 +312,7 @@
 \compattikzset{spring/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@spring@path, l=#1}}
 \compattikzset{mass/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@mass@path, l=#1}}
 \compattikzset{damper/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@damper@path, l=#1}}
+\compattikzset{viscoe/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@viscoe@path, l=#1}}
 \compattikzset{resistor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@resistor@path, l=#1}}
 \compattikzset{american resistor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@bipole@path{resistor}{#1}, l=#1}}
 \compattikzset{european resistor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@bipole@path{generic}{#1}, l=#1}}
@@ -326,6 +343,7 @@
 \compattikzset{gas filled surge arrester/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@gfsurgearrester@path, l=#1}}
 \compattikzset{american inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@americaninductor@path, l=#1}}
 \compattikzset{cute inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteinductor@path, l=#1}}
+\compattikzset{cute choke/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cutechoke@path, l=#1}}
 \compattikzset{european inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@europeaninductor@path, l=#1}}
 \compattikzset{variable inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vinductor@path, l=#1}}
 \compattikzset{variable european inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@veuropeaninductor@path, l=#1}}
@@ -334,6 +352,7 @@
 \compattikzset{tline/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@tline@path, l=#1}}
 \compattikzset{transmission line/.style = {tline = #1}}
 \compattikzset{TL/.style = {tline = #1}}
+\compattikzset{mstline/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@mstline@path, l=#1}}
 \compattikzset{european voltage source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vsource@path, \circuitikzbasekey/bipole/is voltage=true, \circuitikzbasekey/bipole/is voltageoutsideofsymbol=true, v=#1}}
 \compattikzset{american voltage source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vsourceam@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
 \compattikzset{european current source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@isource@path, \circuitikzbasekey/bipole/is current=true, i=#1}}
@@ -364,6 +383,7 @@
 \compattikzset{open/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@open@path}}
 
 \compattikzset{lamp/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@lamp@path}}
+\compattikzset{bulb/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@bulb@path, l=#1}}
 
 \compattikzset{squid/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@squid@path}}
 \compattikzset{barrier/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@barrier@path}}
@@ -392,7 +412,7 @@
 \compattikzset{detector/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@detector@path}}
 
 % % % % % %
-% % Beginn of Diodes
+% % Begin of Diodes
 % % % % % %
 
 \def\pgf@circ@fulldiode@path#1{\pgf@circ@bipole@path{fulldiode}{#1}}
@@ -403,6 +423,7 @@
 \def\pgf@circ@fulllediode@path#1{\pgf@circ@bipole@path{fulllediode}{#1}}
 \def\pgf@circ@fullpdiode@path#1{\pgf@circ@bipole@path{fullpdiode}{#1}}
 \def\pgf@circ@fullvarcap@path#1{\pgf@circ@bipole@path{fullvarcap}{#1}}
+\def\pgf@circ@fullbidirectionaldiode@path#1{\pgf@circ@bipole@path{fullbidirectionaldiode}{#1}}
 \def\pgf@circ@emptydiode@path#1{\pgf@circ@bipole@path{emptydiode}{#1}}
 \def\pgf@circ@emptyzdiode@path#1{\pgf@circ@bipole@path{emptyzdiode}{#1}}
 \def\pgf@circ@emptyzzdiode@path#1{\pgf@circ@bipole@path{emptyzzdiode}{#1}}
@@ -411,6 +432,7 @@
 \def\pgf@circ@emptylediode@path#1{\pgf@circ@bipole@path{emptylediode}{#1}}
 \def\pgf@circ@emptypdiode@path#1{\pgf@circ@bipole@path{emptypdiode}{#1}}
 \def\pgf@circ@emptyvarcap@path#1{\pgf@circ@bipole@path{emptyvarcap}{#1}}
+\def\pgf@circ@emptybidirectionaldiode@path#1{\pgf@circ@bipole@path{emptybidirectionaldiode}{#1}}
 
 \compattikzset{full diode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fulldiode@path}}
 \compattikzset{full Schottky diode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fullsdiode@path}}
@@ -420,6 +442,7 @@
 \compattikzset{full photodiode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fullpdiode@path}}
 \compattikzset{full led/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fulllediode@path}}
 \compattikzset{full varcap/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fullvarcap@path}}
+\compattikzset{full bidirectionaldiode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@fullbidirectionaldiode@path}}
 \compattikzset{full thyristor/.style =  {\circuitikzbasekey, /tikz/to path=\pgf@circ@fullthyristor@path}}
 \compattikzset{full triac/.style =  {\circuitikzbasekey, /tikz/to path=\pgf@circ@fulltriac@path}}
 
@@ -431,6 +454,7 @@
 \compattikzset{empty photodiode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptypdiode@path}}
 \compattikzset{empty led/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptylediode@path}}
 \compattikzset{empty varcap/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptyvarcap@path}}
+\compattikzset{empty bidirectionaldiode/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptybidirectionaldiode@path}}
 \compattikzset{empty thyristor/.style =  {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptythyristor@path}}
 \compattikzset{empty triac/.style =  {\circuitikzbasekey, /tikz/to path=\pgf@circ@emptytriac@path}}
 
@@ -457,6 +481,7 @@
 \compattikzset{diode/.style = {\comnpatname \pgfcircdiodestylemacro diode}}
 \compattikzset{thyristor/.style =  {\comnpatname \pgfcircdiodestylemacro thyristor}}
 \compattikzset{triac/.style =  {\comnpatname \ifpgf@circuit@fulldiode full \else empty \fi triac}}%no stroke triac!
+\compattikzset{bidirectionaldiode/.style =  {\comnpatname \ifpgf@circuit@fulldiode full \else empty \fi bidirectionaldiode}}%no stroke bidirectionaldiode! (based on triac)
 
 %% Define Shortcuts
 \compattikzset{Do/.style = {\comnpatname empty diode}}
@@ -467,6 +492,7 @@
 \compattikzset{pDo/.style = {\comnpatname empty photodiode}}
 \compattikzset{leDo/.style = {\comnpatname empty led}}
 \compattikzset{VCo/.style = {\comnpatname empty varcap}}
+\compattikzset{biDo/.style = {\comnpatname empty bidirectionaldiode}}
 \compattikzset{Tyo/.style = {\comnpatname empty thyristor}}
 \compattikzset{Tro/.style = {\comnpatname empty triac}}
 
@@ -478,6 +504,7 @@
 \compattikzset{pD*/.style = {\comnpatname full photodiode}}
 \compattikzset{leD*/.style = {\comnpatname full led}}
 \compattikzset{VC*/.style = {\comnpatname full varcap}}
+\compattikzset{biD*/.style = {\comnpatname full bidirectionaldiode}}
 \compattikzset{Ty*/.style = {\comnpatname full thyristor}}
 \compattikzset{Tr*/.style = {\comnpatname full triac}}
 
@@ -489,6 +516,7 @@
 \compattikzset{pD/.style = {\comnpatname photodiode}}
 \compattikzset{leD/.style = {\comnpatname led}}
 \compattikzset{VC/.style = {\comnpatname varcap}}
+\compattikzset{biD/.style = {\comnpatname bidirectionaldiode}}
 \compattikzset{Ty/.style = {\comnpatname thyristor}}
 \compattikzset{Tr/.style = {\comnpatname triac}}
 
@@ -502,6 +530,7 @@
 \compattikzset{VC-/.style = {\comnpatname stroke varcap}}
 \compattikzset{Ty-/.style = {\comnpatname stroke thyristor}}
 \compattikzset{Tr-/.style = {\comnpatname empty triac}}%no stroke triac!
+\compattikzset{biD-/.style = {\comnpatname empty bidirectionaldiode}}%no stroke bidirectionaldiode! (based on triac)
 
 % % % % % %
 % % End of Diodes
@@ -517,11 +546,38 @@
 \compattikzset{normal open switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@nos@path, l=#1}}
 \compattikzset{switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cspst@path, l=#1}}
 \compattikzset{push button/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@pushbutton@path, l=#1}}
+\compattikzset{nopb/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@pushbutton@path, l=#1}}
+\compattikzset{normally open push button/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@pushbutton@path, l=#1}}
+\compattikzset{ncpb/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ncpushbutton@path, l=#1}}
+\compattikzset{normally closed push button/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ncpushbutton@path, l=#1}}
 \compattikzset{toggle switch/.style =  {\circuitikzbasekey, /tikz/to path=\pgf@circ@toggleswitch@path}}
 
 \compattikzset{ammeter/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ammeter@path}}
 \compattikzset{voltmeter/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@voltmeter@path}}
 \compattikzset{ohmmeter/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ohmmeter@path}}
+\tikzset{oscope/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@oscope@path, l=#1}}
+
+% cute switches
+%% closed cute switch
+\def\pgf@circ@cuteclosedswitch@path#1{\pgf@circ@bipole@path{cuteclosedswitch}{#1}}
+\compattikzset{cute closed switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteclosedswitch@path, l=#1}}
+\compattikzset{ccsw/.style= {\comnpatname cute closed switch= #1}}
+
+%% open cute switch
+\def\pgf@circ@cuteopenswitch@path#1{\pgf@circ@bipole@path{cuteopenswitch}{#1}}
+\compattikzset{cute open switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteopenswitch@path, l=#1}}
+\compattikzset{cosw/.style= {\comnpatname cute open switch= #1}}
+
+%% closing cute switch
+\def\pgf@circ@cuteclosingswitch@path#1{\pgf@circ@bipole@path{cuteclosingswitch}{#1}}
+\compattikzset{cute closing switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteclosingswitch@path, l=#1}}
+\compattikzset{ccgsw/.style= {\comnpatname cute closing switch= #1}}
+
+%% opening cute switch
+\def\pgf@circ@cuteopeningswitch@path#1{\pgf@circ@bipole@path{cuteopeningswitch}{#1}}
+\compattikzset{cute opening switch/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteopeningswitch@path, l=#1}}
+\compattikzset{cogsw/.style= {\comnpatname cute opening switch= #1}}
+
 
 % short forms
 \compattikzset{esource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@esource@path, \circuitikzbasekey/bipole/is voltage=true,\circuitikzbasekey/bipole/is voltageoutsideofsymbol=true,  v=#1}}
@@ -549,7 +605,6 @@
 \compattikzset{controlled isourcesin/.style = {\comnpatname controlled sinusoidal current source = #1}}
 
 \compattikzset{R/.style= {\comnpatname resistor = #1}}
-%\ifpgf@circuit@compat\else\compattikzset{R/.style= {resistor = #1}}\fi
 \compattikzset{vR/.style= {\comnpatname variable resistor = #1}}
 \compattikzset{phR/.style= {\comnpatname photoresistor = #1}}
 \compattikzset{thR/.style= {\comnpatname thermistor = #1}}
@@ -569,13 +624,13 @@
 \compattikzset{sqV/.style = {\comnpatname square voltage source = #1}}
 \compattikzset{tV/.style = {\comnpatname triangle voltage source = #1}}
 \compattikzset{csV/.style = {\comnpatname controlled sinusoidal voltage source = #1}}
-\def\pgf@temp#1{ 
-	\compattikzset{V#1/.style = {\comnpatname voltage source, v#1=##1} } 
-	\compattikzset{cV#1/.style = {\comnpatname controlled  voltage source, v#1=##1} } 
-	\compattikzset{sV#1/.style = {\comnpatname sinusoidal  voltage source, v#1=##1} } 
-	\compattikzset{csV#1/.style = {\comnpatname controlled sinusoidal voltage source, v#1=##1} } 
+\def\pgf@temp#1{
+    \compattikzset{V#1/.style = {\comnpatname voltage source, v#1=##1} }
+    \compattikzset{cV#1/.style = {\comnpatname controlled  voltage source, v#1=##1} }
+    \compattikzset{sV#1/.style = {\comnpatname sinusoidal  voltage source, v#1=##1} }
+    \compattikzset{csV#1/.style = {\comnpatname controlled sinusoidal voltage source, v#1=##1} }
 }
-\pgf@temp{_>} \pgf@temp{_<} \pgf@temp{^>} \pgf@temp{^<} 
+\pgf@temp{_>} \pgf@temp{_<} \pgf@temp{^>} \pgf@temp{^<}
 \pgf@temp{>} \pgf@temp{<} \pgf@temp{^} \pgf@temp{_}
 
 %current sources
@@ -583,17 +638,63 @@
 \compattikzset{cI/.style = {\comnpatname controlled current source = #1}}
 \compattikzset{sI/.style = {\comnpatname sinusoidal current source = #1}}
 \compattikzset{csI/.style = {\comnpatname controlled sinusoidal current source = #1}}
-\def\pgf@temp#1{ 
-	\compattikzset{I#1/.style = {\comnpatname current source, i#1=##1} } 
-	\compattikzset{cI#1/.style = {\comnpatname controlled current source, i#1=##1} } 
-	\compattikzset{sI#1/.style = {\comnpatname sinusoidal current source, i#1=##1} } 
-	\compattikzset{csI#1/.style = {\comnpatname controlled sinusoidal current source, i#1=##1} } 
+\def\pgf@temp#1{
+    \compattikzset{I#1/.style = {\comnpatname current source, i#1=##1} }
+    \compattikzset{cI#1/.style = {\comnpatname controlled current source, i#1=##1} }
+    \compattikzset{sI#1/.style = {\comnpatname sinusoidal current source, i#1=##1} }
+    \compattikzset{csI#1/.style = {\comnpatname controlled sinusoidal current source, i#1=##1} }
 }
 \pgf@temp{_>} \pgf@temp{_<} \pgf@temp{^>} \pgf@temp{^<}
 \pgf@temp{>_} \pgf@temp{<_} \pgf@temp{>^} \pgf@temp{<^}
 \pgf@temp{>} \pgf@temp{<} \pgf@temp{^} \pgf@temp{_}
 
-
+% cute sources
+\def\pgf@circ@vsourceC@path#1{\pgf@circ@bipole@path{vsourceC}{#1}}
+\compattikzset{cute european voltage source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vsourceC@path, \circuitikzbasekey/bipole/is voltage=true, \circuitikzbasekey/bipole/is voltageoutsideofsymbol=true, v=#1}}
+\compattikzset{vsourceC/.style= {\comnpatname cute european voltage source= #1}}
+\compattikzset{ceV/.style= {\comnpatname cute european voltage source= #1}}
+
+\def\pgf@circ@isourceC@path#1{\pgf@circ@bipole@path{isourceC}{#1}}
+\compattikzset{cute european current source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@isourceC@path, \circuitikzbasekey/bipole/is current=true, i=#1}}
+\compattikzset{isourceC/.style= {\comnpatname cute european current source= #1}}
+\compattikzset{ceI/.style= {\comnpatname cute european current source= #1}}
+
+\def\pgf@circ@cvsourceC@path#1{\pgf@circ@bipole@path{cvsourceC}{#1}}
+\compattikzset{cute european controlled voltage source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cvsourceC@path, \circuitikzbasekey/bipole/is voltage=true, \circuitikzbasekey/bipole/is voltageoutsideofsymbol=true, v=#1}}
+\compattikzset{cvsourceC/.style= {\comnpatname cute european controlled voltage source= #1}}
+\compattikzset{cceV/.style= {\comnpatname cute european controlled voltage source= #1}}
+
+\def\pgf@circ@cisourceC@path#1{\pgf@circ@bipole@path{cisourceC}{#1}}
+\compattikzset{cute european controlled current source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cisourceC@path,  \circuitikzbasekey/bipole/is current=true, i=#1}}
+\compattikzset{cisourceC/.style= {\comnpatname cute european controlled current source= #1}}
+\compattikzset{cceI/.style= {\comnpatname cute european controlled current source= #1}}
+
+% noise sources
+\def\pgf@circ@vsourceN@path#1{\pgf@circ@bipole@path{vsourceN}{#1}}
+\compattikzset{noise voltage source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vsourceN@path, \circuitikzbasekey/bipole/is voltage=true, \circuitikzbasekey/bipole/is voltageoutsideofsymbol=true, v=#1}}
+\compattikzset{vsourceN/.style= {\comnpatname noise voltage source= #1}}
+\compattikzset{nV/.style= {\comnpatname noise voltage source= #1}}
+
+\def\pgf@circ@isourceN@path#1{\pgf@circ@bipole@path{isourceN}{#1}}
+\compattikzset{noise current source/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@isourceN@path, \circuitikzbasekey/bipole/is current=true, i=#1}}
+\compattikzset{isourceN/.style= {\comnpatname noise current source= #1}}
+\compattikzset{nI/.style= {\comnpatname noise current source= #1}}
+
+% resistive sensor american style
+\def\pgf@circ@resistivesens@path#1{\pgf@circ@bipole@path{resistivesens}{#1}}
+\compattikzset{american resistive sensor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@resistivesens@path, l=#1}}
+\compattikzset{european resistive sensor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@thermistorntc@path, l=#1}}
+\compattikzset{resistive sensor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@sresistor@path, l=#1}}
+\compattikzset{sR/.style= {\comnpatname resistive sensor= #1}}
+
+\compattikzset{capacitive sensor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@capacitivesens@path, l=#1}}
+\compattikzset{sC/.style= {\comnpatname capacitive sensor= #1}}
+
+\compattikzset{cute inductive sensor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@cuteinductivesens@path, l=#1}}
+\compattikzset{european inductive sensor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@europeaninductivesens@path, l=#1}}
+\compattikzset{american inductive sensor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@americaninductivesens@path, l=#1}}
+\compattikzset{inductive sensor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@inductivesens@path, l=#1}}
+\compattikzset{sL/.style= {\comnpatname inductive sensor= #1}}
 
 \compattikzset{Mr/.style = {\comnpatname memristor}}
 
@@ -606,75 +707,79 @@
 \compattikzset{vdd/.style = {\comnpatname vcc = #1}}
 \compattikzset{vss/.style = {\comnpatname vee = #1}}
 
-\def\inheritlogicport#1#2{
-	\pgfdeclareshape{#2 port}{
-		\inheritsavedanchors[from=#1 #2 port]
-		\inheritbackgroundpath[from=#1 #2 port]
-		\inheritanchor[from=#1 #2 port]{in}
-		\inheritanchor[from=#1 #2 port]{in 1}
-		\inheritanchor[from=#1 #2 port]{in 2}
-		\inheritanchor[from=#1 #2 port]{out}
-		\inheritanchor[from=#1 #2 port]{center}
-		\inheritanchor[from=#1 #2 port]{left}
-	}
-}
+% activate the to-style crossing
+\def\pgf@circ@crossing@path#1{\pgf@circ@bipole@path{crossing}{#1}}
+\compattikzset{crossing/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@crossing@path, l=#1}}
+\compattikzset{xing/.style= {\comnpatname crossing= #1}}
+
+%% loudspeaker and microphone
+
+\def\pgf@circ@loudspeaker@path#1{\pgf@circ@bipole@path{loudspeaker}{#1}}
+\compattikzset{loudspeaker/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@loudspeaker@path, l=#1}}
+
+\def\pgf@circ@mic@path#1{\pgf@circ@bipole@path{mic}{#1}}
+\compattikzset{mic/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@mic@path, l=#1}}
+
+% more instrument
+\def\pgf@circ@rmeter@path#1{\pgf@circ@bipole@path{rmeter}{#1}}
+\compattikzset{rmeter/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@rmeter@path, l=#1}}
+\def\pgf@circ@rmeterwa@path#1{\pgf@circ@bipole@path{rmeterwa}{#1}}
+\compattikzset{rmeterwa/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@rmeterwa@path, l=#1}}
+\def\pgf@circ@smeter@path#1{\pgf@circ@bipole@path{smeter}{#1}}
+\compattikzset{smeter/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@smeter@path, l=#1}}
+% current loop probes
+\def\pgf@circ@iloop@path#1{\pgf@circ@bipole@path{iloop}{#1}}
+\compattikzset{iloop/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@iloop@path, l=#1}}
+\def\pgf@circ@iloop2@path#1{\pgf@circ@bipole@path{iloop2}{#1}}
+\compattikzset{iloop2/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@iloop2@path, l=#1}}
+% qucs-style probes
+\def\pgf@circ@qiprobe@path#1{\pgf@circ@bipole@path{qiprobe}{#1}}
+\compattikzset{qiprobe/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@qiprobe@path, l=#1}}
+\def\pgf@circ@qvprobe@path#1{\pgf@circ@bipole@path{qvprobe}{#1}}
+\compattikzset{qvprobe/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@qvprobe@path, l=#1}}
+\def\pgf@circ@qpprobe@path#1{\pgf@circ@bipole@path{qpprobe}{#1}}
+\compattikzset{qpprobe/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@qpprobe@path, l=#1}}
 
-\ifpgf@circuit@europeanlogicport
-	\inheritlogicport{european}{and}
-	\inheritlogicport{european}{or}
-	\inheritlogicport{european}{xor}
-	\inheritlogicport{european}{not}
-	\inheritlogicport{european}{nand}
-	\inheritlogicport{european}{nor}
-	\inheritlogicport{european}{xnor}
-\else
-	\inheritlogicport{american}{and}
-	\inheritlogicport{american}{or}
-	\inheritlogicport{american}{xor}
-	\inheritlogicport{american}{not}
-	\inheritlogicport{american}{nand}
-	\inheritlogicport{american}{nor}
-	\inheritlogicport{american}{xnor}
-\fi
 
 % Transistor like bipoles
 
 \def\pgf@circ@trans@path#1#2{
-	\pgfextra{
-		\edef\pgf@temp{\pgfkeysvalueof{/tikz/circuitikz/bipole/name}}
-		\def\pgf@circ@temp{#2}
-		\ifx\pgf@temp\pgf@circ@temp % if it has not a name
-			\pgfmathrandominteger{\pgf@circ@rand}{1000}{9999}
-			\ctikzset{bipole/name = trans\pgf@circ@rand} % create it
-		\fi
-	}
-	\ifpgf@circuit@bipole@inverted
-		(\tikztostart) node[coordinate] (\ctikzvalof{bipole/name}end) {}
-		(\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}start) {} 	
-	\else
-		(\tikztostart) node[coordinate] (\ctikzvalof{bipole/name}start) {}
-		(\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}end) {} 
-	\fi
-	\pgfextra{
-		\pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
-					   {\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}}
-		\pgfmathadd{\pgfmathresult}{-90}
-		\edef\pgf@circ@direction{\pgfmathresult}
-	}
-	($(\tikztostart) ! .5 ! (\tikztotarget)$) 
-		node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}]
-			(\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/label/name}}
-		\ifcsname pgf@anchor@#1@pathstart\endcsname%if special path-anchors are defined, use them!
-			(\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.pathstart)
-			(\ctikzvalof{bipole/name}.pathend)  -- (\ctikzvalof{bipole/name}end.center)
-		\else
-			(\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.left)
-			(\ctikzvalof{bipole/name}.right)  -- (\ctikzvalof{bipole/name}end.center)
-		\fi
-	\pgfextra{
-		\pgfcircresetpath
-	}  
-	(\tikztotarget) 	\tikztonodes  % e si continua
+    \pgfextra{
+        \edef\pgf@temp{\pgfkeysvalueof{/tikz/circuitikz/bipole/name}}
+        \def\pgf@circ@temp{#2}
+        \ifx\pgf@temp\pgf@circ@temp % if it has not a name
+            \pgfmathrandominteger{\pgf@circ@rand}{1000}{9999}
+            \ctikzset{bipole/name = trans\pgf@circ@rand} % create it
+        \fi
+    }
+    \ifpgf@circuit@bipole@inverted
+        (\tikztostart) node[coordinate] (\ctikzvalof{bipole/name}end) {}
+        (\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}start) {}
+    \else
+        (\tikztostart) node[coordinate] (\ctikzvalof{bipole/name}start) {}
+        (\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}end) {}
+    \fi
+    \pgfextra{
+        \pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
+        {\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}}
+        \pgfmathadd{\pgfmathresult}{-90}
+        \pgfmathround{\pgfmathresult}
+        \edef\pgf@circ@direction{\pgfmathresult}
+    }
+    ($(\tikztostart) ! .5 ! (\tikztotarget)$)
+    node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}]
+    (\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/label/name}}
+    \ifcsname pgf@anchor@#1@pathstart\endcsname%if special path-anchors are defined, use them!
+        (\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.pathstart)
+        (\ctikzvalof{bipole/name}.pathend)  -- (\ctikzvalof{bipole/name}end.center)
+    \else
+        (\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.left)
+        (\ctikzvalof{bipole/name}.right)  -- (\ctikzvalof{bipole/name}end.center)
+    \fi
+    \pgfextra{
+        \pgfcircresetpath
+    }
+    (\tikztotarget) 	\tikztonodes  % e si continua
 }
 
 
@@ -685,6 +790,7 @@
 \pgf@circ@definetranspath{elmech}
 \pgf@circ@definetranspath{nmos}
 \pgf@circ@definetranspath{pmos}
+\pgf@circ@definetranspath{hemt}
 \pgf@circ@definetranspath{npn}
 \pgf@circ@definetranspath{pnp}
 \pgf@circ@definetranspath{nfet}
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
index e1951a6319c..b1082ac4a12 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
@@ -5,535 +5,829 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Quadripoles
 
 \long\def\pgfcircdeclarequadpole#1#2#3{
-	\pgfdeclareshape{#1}
-	{
-	  \anchor{center}{
-	  	\northwest
-		\pgf@x=0pt
-	  }
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=.5\pgf@circ@Rlen
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/width}\pgf@x
-	  }
-	  \anchor{A2}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{B1}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{A1}{
-		\northwest
-	  }
-	  \anchor{B2}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-	  	\northwest
-		\pgf@x=0pt
-	  }
-	  \anchor{south}{
-	  	\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{west}{
-	  	\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{east}{
-	  	\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \anchor{base}{
-	  	\northwest
-		\pgf@x=0pt	  	
-	  }
-	  #3
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-			#2
-	  
-	  }
-	}
+    \pgfdeclareshape{#1}
+    {
+        \anchor{center}{
+            \northwest
+            \pgf@x=0pt
+            \pgf@y=0pt
+        }
+        \savedmacro{\stretto}{\def\stretto{0.4}}
+        \savedanchor\northwest{%
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=.5\pgf@circ@Rlen
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/width}\pgf@x
+        }
+        \anchor{A2}{
+            \northwest
+            \pgf@y=-\pgf@y
+        }
+        \anchor{B1}{
+            \northwest
+            \pgf@x=-\pgf@x
+        }
+        \anchor{A1}{
+            \northwest
+        }
+        \anchor{B2}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=-\pgf@y
+        }
+        %% notice for the dot anchors: I use the cute inductors as reference
+        %% size; if you change one you have to change all of them.
+        \anchor{inner dot A1}{
+            \northwest
+            \pgfmathsetlength\pgf@x{\stretto*\pgf@x +
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{0.5*\pgf@circ@Rlen}
+        }
+        \anchor{outer dot A1}{
+            \northwest
+            \pgfmathsetlength\pgf@x{\stretto*\pgf@x -
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{0.5*\pgf@circ@Rlen}
+        }
+        \anchor{inner dot A2}{
+            \northwest
+            \pgfmathsetlength\pgf@x{\stretto*\pgf@x +
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{-0.5*\pgf@circ@Rlen}
+        }
+        \anchor{outer dot A2}{
+            \northwest
+            \pgfmathsetlength\pgf@x{\stretto*\pgf@x -
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{-0.5*\pgf@circ@Rlen}
+        }
+        \anchor{inner dot B1}{
+            \northwest
+            \pgfmathsetlength\pgf@x{-\stretto*\pgf@x -
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{0.5*\pgf@circ@Rlen}
+        }
+        \anchor{outer dot B1}{
+            \northwest
+            \pgfmathsetlength\pgf@x{-\stretto*\pgf@x +
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{0.5*\pgf@circ@Rlen}
+        }
+        \anchor{inner dot B2}{
+            \northwest
+            \pgfmathsetlength\pgf@x{-\stretto*\pgf@x -
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{-0.5*\pgf@circ@Rlen}
+        }
+        \anchor{outer dot B2}{
+            \northwest
+            \pgfmathsetlength\pgf@x{-\stretto*\pgf@x +
+            \ctikzvalof{bipoles/cuteinductor/height}*\pgf@circ@Rlen/2}
+            \pgfmathsetlength\pgf@y{-0.5*\pgf@circ@Rlen}
+        }
+        \anchor{north}{
+            \northwest
+            \pgf@x=0pt
+        }
+        \anchor{south}{
+            \northwest
+            \pgf@x=0pt
+            \pgf@y=-\pgf@y
+        }
+        \anchor{west}{
+            \northwest
+            \pgf@y=0pt
+        }
+        \anchor{east}{
+            \northwest
+            \pgf@y=0pt
+            \pgf@x=-\pgf@x
+        }
+        \anchor{south west}{
+            \northwest
+            \pgf@y=-\pgf@y
+        }
+        \anchor{north east}{
+            \northwest
+            \pgf@x=-\pgf@x
+        }
+        \anchor{north west}{
+            \northwest
+        }
+        \anchor{south east}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=-\pgf@y
+        }
+        \anchor{base}{
+            \northwest
+            \pgf@x=0pt
+        }
+        #3
+        \backgroundpath{
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+            \northwest
+            \pgf@circ@res@up = \pgf@y
+            \pgf@circ@res@down = -\pgf@y
+            \pgf@circ@res@right = -\pgf@x
+            \pgf@circ@res@left = \pgf@x
+            #2
+        }
+    }
 }
 
 
-
 \def\pgf@circ@drawtransformerbasicanchor{
-	\pgfkeysvalueof{/tikz/circuitikz/quadpoles/trans/height}
-	 \anchor{AA2}{
-		\northwest
-		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
-		\pgf@x=.7\pgf@x
-		\pgf@y=-\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
-	  }
-	  \anchor{BB1}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
-		\pgf@x=.7\pgf@x
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
-	  }
-	  \anchor{AA1}{
-		\northwest
-		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
-		\pgf@x=.7\pgf@x
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
-	  }
-	  \anchor{BB2}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
-		\pgf@x=.7\pgf@x
-		\pgf@y=-\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
-	  }
+    \pgfkeysvalueof{/tikz/circuitikz/quadpoles/trans/height}
+    \anchor{AA2}{
+        \northwest
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
+        \pgf@x=.7\pgf@x
+        \pgf@y=-\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
+    }
+    \anchor{BB1}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
+        \pgf@x=.7\pgf@x
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
+    }
+    \anchor{AA1}{
+        \northwest
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
+        \pgf@x=.7\pgf@x
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
+    }
+    \anchor{BB2}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/width1}\pgf@x
+        \pgf@x=.7\pgf@x
+        \pgf@y=-\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/transformer/height1}\pgf@y
+    }
 }
 
 \def\pgf@circ@drawtransformerbasicbody{
-	\def\stretto{.4}
-	\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgftransformlineattime{.5}{%
-				\pgfpoint%
-					{\stretto\pgf@circ@res@left}%
-					{\pgf@circ@res@up}%
-			}{%
-				\pgfpoint
-					{\stretto\pgf@circ@res@left}%
-					{\pgf@circ@res@down}%
-			}
-			
-			\edef\pgf@circ@temp{\ctikzvalof{inductor}}%
-			\def\pgf@temp{european}%
-			\ifx\pgf@temp\pgf@circ@temp%
-				\pgfnode{fullgenericshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
-			\else%
-				\def\pgf@temp{cute}
-				\ifx\pgf@temp\pgf@circ@temp%
-					\pgfnode{cuteinductorshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
-				\else%
-					\pgfnode{americaninductorshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
-				\fi%
-			\fi%
-
-			
-	\endpgfscope
-	\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgftransformlineattime{.5}{%
-				\pgfpoint%
-					{\stretto\pgf@circ@res@right}%
-					{\pgf@circ@res@down}%
-			}{%
-				\pgfpoint
-					{\stretto\pgf@circ@res@right}%
-					{\pgf@circ@res@up}%
-			}
-
-			\edef\pgf@circ@temp{\ctikzvalof{inductor}}%
-			\def\pgf@temp{european}%
-			\ifx\pgf@temp\pgf@circ@temp%
-				\pgfnode{fullgenericshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
-			\else%
-				\def\pgf@temp{cute} 
-				\ifx\pgf@temp\pgf@circ@temp%
-					\pgfnode{cuteinductorshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
-				\else%
-					\pgfnode{americaninductorshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
-				\fi%
-			\fi%
-			
-	\endpgfscope
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpointanchor{pgf@inductor1}{b}}
-	
-	\pgfpathmoveto{\pgfpointanchor{pgf@inductor1}{a}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpointanchor{pgf@inductor2}{a}}
-	
-	\pgfpathmoveto{\pgfpointanchor{pgf@inductor2}{b}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	
-	\pgfusepath{draw}
-	
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgftransformlineattime{.5}{%
+            \pgfpoint%
+            {\stretto\pgf@circ@res@left}%
+            {\pgf@circ@res@up}%
+            }{%
+            \pgfpoint
+            {\stretto\pgf@circ@res@left}%
+            {\pgf@circ@res@down}%
+        }
+
+        \edef\pgf@circ@temp{\ctikzvalof{inductor}}%
+        \def\pgf@temp{european}%
+        \ifx\pgf@temp\pgf@circ@temp%
+            \pgfnode{fullgenericshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
+        \else%
+            \def\pgf@temp{cute}
+            \ifx\pgf@temp\pgf@circ@temp%
+                \pgfnode{cuteinductorshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
+            \else%
+                \pgfnode{americaninductorshape}{center}{}{pgf@inductor1}{\pgfusepath{stroke}}
+            \fi%
+        \fi%
+
+
+    \endpgfscope
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgftransformlineattime{.5}{%
+            \pgfpoint%
+            {\stretto\pgf@circ@res@right}%
+            {\pgf@circ@res@down}%
+            }{%
+            \pgfpoint
+            {\stretto\pgf@circ@res@right}%
+            {\pgf@circ@res@up}%
+        }
+
+        \edef\pgf@circ@temp{\ctikzvalof{inductor}}%
+        \def\pgf@temp{european}%
+        \ifx\pgf@temp\pgf@circ@temp%
+            \pgfnode{fullgenericshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
+        \else%
+            \def\pgf@temp{cute}
+            \ifx\pgf@temp\pgf@circ@temp%
+                \pgfnode{cuteinductorshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
+            \else%
+                \pgfnode{americaninductorshape}{center}{}{pgf@inductor2}{\pgfusepath{stroke}}
+            \fi%
+        \fi%
+
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpointanchor{pgf@inductor1}{b}}
+
+    \pgfpathmoveto{\pgfpointanchor{pgf@inductor1}{a}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpointanchor{pgf@inductor2}{a}}
+
+    \pgfpathmoveto{\pgfpointanchor{pgf@inductor2}{b}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+
+    \pgfusepath{draw}
+
 }
 
 
-	
-	% contrib Kristofer M. Monisit
-	
-	\pgfdeclareshape{fd op amp}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{-}{
-		\inOne
-	  }
-	  \anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\up{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-			\pgf@circ@res@up = \pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-	    \pgfpointlineattime{
-			\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/up pos}}{
-			\pgfpoint{
-				\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-				{\pgf@circ@res@up}}
-			{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	  }
-	  \anchor{up}{
-		\up
-	  }
-	  \anchor{down}{
-		\up
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out +}{
-		\northwest
-		\pgf@y=.5\pgf@y
-		\pgf@x=-.7\pgf@x
-	  }
-	  \anchor{out -}{
-		\northwest
-		\pgf@y=-.5\pgf@y
-		\pgf@x=-.7\pgf@x
-	  }
-	  \anchor{west}{
-	  	\left
-      }
-		\anchor{east}{
-			\left
-			\pgf@x=-\pgf@x
-		}
-
-	  \backgroundpath{
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-
-      \northwest
-      \pgf@circ@res@up = \pgf@y
-      \pgf@circ@res@down = -\pgf@y
-      \pgf@circ@res@right = -\pgf@x
-      \pgf@circ@res@left = \pgf@x
-
-      % Negative input terminal
-      \pgfpathmoveto{\pgfpoint
-        {\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-      \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $-$}
-  
-
-      % Positive input terminal
-      \pgfpathmoveto{\pgfpoint
-        {\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-      \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $+$}
-  
-
-      % Negative output terminal
-      \pgfpathmoveto{\pgfpoint
-        {0.7\pgf@circ@res@right}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-      \pgftext[left, at=\pgfpoint{0.3\pgf@circ@res@left}{.3\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $-$}
-  
-
-      % Positive output terminal
-      \pgfpathmoveto{\pgfpoint
-        {0.7\pgf@circ@res@right}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-      \pgftext[left, at=\pgfpoint{0.3\pgf@circ@res@left}{.3\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $+$}
-  
-	  \pgfsetrectcap
-      % Draw them all!
-      \pgfusepath{draw}
-
-      % Triangle
-      \pgfscope
-        \pgfsetlinewidth{2\pgflinewidth}
-        \pgftransformxshift{.7\pgf@circ@res@left}
-        \pgf@circ@res@step=\pgf@circ@res@right
-        \advance\pgf@circ@res@step by -\pgf@circ@res@left
-        \pgf@circ@res@step=.7\pgf@circ@res@step
-        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-        \pgfpathclose
-        \pgfusepath{draw}
-      \endpgfscope
-	  }
-	}
 
+% contrib Kristofer M. Monisit
+
+\pgfdeclareshape{fd op amp}
+{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \savedanchor\outline{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    \ifpgf@circuit@oa@oplusup\else\pgf@y=-\pgf@y\fi
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y\pgf@x=0pt\relax
+    }
+    \anchor{north}{
+        \northwest\pgf@x=0pt\relax
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \savedanchor\inOneFixed{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out up}{
+        \northwest
+        \pgf@y=.5\pgf@y
+        \pgf@x=-.7\pgf@x
+    }
+    \anchor{out down}{
+        \northwest
+        \pgf@y=-.5\pgf@y
+        \pgf@x=-.7\pgf@x
+    }
+    \anchor{out +}{
+        \outline
+        \pgf@y=.5\pgf@y
+        \pgf@x=-.7\pgf@x
+    }
+    \anchor{out -}{
+        \outline
+        \pgf@y=-.5\pgf@y
+        \pgf@x=-.7\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-.7\pgf@x
+    }
+
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-.7\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-.7\pgf@x \pgf@y=-\pgf@y }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        % Triangle
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/quadpoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+        % Negative input terminal
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+        % Positive input terminal
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+
+        % Negative output terminal
+        \pgfpathmoveto{\pgfpoint
+            {0.7\pgf@circ@res@right}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{0.3\pgf@circ@res@left}{.3\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@oplusup$-$\else$+$\fi}
+
+        % Positive output terminal
+        \pgfpathmoveto{\pgfpoint
+            {0.7\pgf@circ@res@right}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgftext[left, at=\pgfpoint{0.3\pgf@circ@res@left}{.3\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@oplusup$+$\else$-$\fi}
+
+        \pgfsetrectcap
+        % Draw them all!
+        \pgfusepath{draw}
 
+    }
+}
 
 
-\pgfcircdeclarequadpole{transformer}{
+%% instrumentation amplifier diff output
+
+\pgfdeclareshape{fd inst amp}
+{
+    % when tikz calls the anchor it wants the relative position in the lengths
+    % \pgf@x  \pgf@y
+    % \pgfpoint* functions set that variables
+    % anchors are visible outside and run on use
+    \anchor{center}{\pgfpointorigin}
+    % savedanchors are internals and run on node creation (not use)
+    % bounding-box top left
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{nw}{
+        \northwest
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y\pgf@x=0pt\relax
+    }
+    \anchor{north}{
+        \northwest\pgf@x=0pt\relax
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {\left
+        \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    }
+    \savedanchor\inOneFixed{%
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+          \pgf@y=.5\pgf@y
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+          \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+          \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    % reference voltage input anchors.
+    \savedanchor\refv{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/refv pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+    }
+    % we need both because they are normally drawn under the amp, and if you
+    % mirror it vertically you need them
+    \anchor{refv up}{
+        \refv
+    }
+    \anchor{refv down}{
+        \refv
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\outport{
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=-.5\pgf@x
+        \ifpgf@circuit@oa@oplusup\else\pgf@y=-\pgf@y\fi
+    }
+    \anchor{out}{
+        \outport
+        \pgf@y=0pt
+    }
+    \anchor{out +}{
+        \outport
+    }
+    \anchor{out -}{
+        \outport
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\outportfixed{
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/width}\pgf@circ@Rlen
+        \pgf@x=-.5\pgf@x
+    }
+    \anchor{out up}{
+        \outportfixed
+    }
+    \anchor{out down}{
+        \outportfixed
+        \pgf@y=-\pgf@y
+    }
+    %
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    % let's start drawing the component
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        %
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        % main component, normally in thicker lines
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+            %first point (near output)
+            \pgfpathmoveto{\pgfpoint{1.4\pgf@circ@res@right}{0}}
+            %from the exit to the top (short side)... (note that the .6 must be copied in \up and \refv anchors
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+            % and then to the input "front up", "down", to the output short side "down"
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.6\pgf@circ@res@down}}
+            % ...and close
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+        % input terminal up
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}}
+        %
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+        % input terminal down
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+        % output leads down and up
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}} %
+        \pgftext[right, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$-\;$\else$+\;$\fi}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}} %
+        \pgftext[right, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/port width}\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/fd inst amp/font}\ifpgf@circuit@oa@oplusup$+\;$\else$-\;$\fi}
+        %
+        \pgfsetrectcap
+        \pgfusepath{draw}
+    }
+}
 
-	\pgf@circ@drawtransformerbasicbody
 
+\pgfcircdeclarequadpole{transformer}{
+    \pgf@circ@drawtransformerbasicbody
 }{\pgf@circ@drawtransformerbasicanchor}
 
 \pgfcircdeclarequadpole{transformer core}{
 
-	\pgf@circ@drawtransformerbasicbody
-	
-	\pgfmoveto{\pgfpoint%
-					{\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@right}%
-					{\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@down}%
-					}
-	\pgflineto{
-				\pgfpoint
-					{\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@right}%
-					{\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@up}%
-					}
-
-	\pgfmoveto{\pgfpoint%
-					{\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@left}%
-					{\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@down}%
-					}
-	\pgflineto{
-				\pgfpoint
-					{\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@left}%
-					{\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@up}%
-					}					
-	
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth}
-	\pgfusepath{draw}
+    \pgf@circ@drawtransformerbasicbody
+
+    \pgfmoveto{\pgfpoint%
+        {\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@right}%
+        {\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@down}%
+    }
+    \pgflineto{
+        \pgfpoint
+        {\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@right}%
+        {\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@up}%
+    }
+
+    \pgfmoveto{\pgfpoint%
+        {\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@left}%
+        {\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@down}%
+    }
+    \pgflineto{
+        \pgfpoint
+        {\ctikzvalof{quadpoles/transformer core/core width}\pgf@circ@res@left}%
+        {\ctikzvalof{quadpoles/transformer core/core height}\pgf@circ@res@up}%
+    }
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth}
+    \pgfusepath{draw}
 }{\pgf@circ@drawtransformerbasicanchor}
 
 
 \pgfcircdeclarequadpole{gyrator}{
 
-	\def\stretto{.4}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint{\stretto\pgf@circ@res@left}{.7*\stretto\pgf@circ@res@down}}
-	\pgfpatharc{90}{270}{.7*\stretto\pgf@circ@res@down}
-	
-	\pgfpathmoveto{\pgfpoint{\stretto\pgf@circ@res@right}{.7*\stretto\pgf@circ@res@up}}
-	\pgfpatharc{-90}{90}{.7*\stretto\pgf@circ@res@down}
-	\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\stretto\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/quadpoles/thickness}\pgflinewidth}
+    \pgfpathmoveto{\pgfpoint{\stretto\pgf@circ@res@left}{.7*\stretto\pgf@circ@res@down}}
+    \pgfpatharc{90}{270}{.7*\stretto\pgf@circ@res@down}
+
+    \pgfpathmoveto{\pgfpoint{\stretto\pgf@circ@res@right}{.7*\stretto\pgf@circ@res@up}}
+    \pgfpatharc{-90}{90}{.7*\stretto\pgf@circ@res@down}
+    \pgfusepath{draw}
 
 }{}
 
 %% four-port
 % defines a general outer box for four-ports
-% TikZ usage: 
+% TikZ usage:
 %		\draw (0,0) node[coupler](coup){\SI{-3}{dB}}
 %		(coup.port1) to[short,-o] ++(-1,0)
 %
 
 \long\def\pgfcircdeclarefourport#1#2{
-	\pgfdeclareshape{#1}{
-		\anchor{center}{
-			\northwest
-			\pgf@x=0pt
-			\pgf@y=0pt
-		}
-		\savedanchor\northwest{%
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=.5\pgf@circ@Rlen
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/width}\pgf@x
-			}
-		\anchor{north}{
-			\northwest
-			\pgf@x=0pt
-		}
-		\anchor{south}{
-			\northwest
-			\pgf@x=0pt
-			\pgf@y=-\pgf@y
-		}
-		\anchor{west}{
-			\northwest
-			\pgf@y=0pt
-		}
-		\anchor{east}{
-			\northwest
-			\pgf@y=0pt
-			\pgf@x=-\pgf@x
-		}
-		\anchor{south west}{
-			\northwest
-			\pgf@y=-\pgf@y
-		}
-		\anchor{north east}{
-			\northwest
-			\pgf@x=-\pgf@x
-		}
-			\anchor{north west}{
-			\northwest
-		}
-		\anchor{south east}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=-\pgf@y
-		}
-		\anchor{port1}{
-			\northwest
-			\pgf@y=-0.5\pgf@y
-		}
-		\anchor{port2}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=-0.5\pgf@y
-		}
-		\anchor{port3}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=0.5\pgf@y
-		}
-		\anchor{port4}{
-			\northwest
-			\pgf@y=0.5\pgf@y
-		}
-		\anchor{1}{
-			\northwest
-			\pgf@y=-0.5\pgf@y
-		}
-		\anchor{2}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=-0.5\pgf@y
-		}
-		\anchor{3}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=0.5\pgf@y
-		}
-		\anchor{4}{
-			\northwest
-			\pgf@y=0.5\pgf@y
-		}
-		
-		\anchor{text}{
-			\northwest
-			\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
-			\pgf@x=-.5\wd\pgfnodeparttextbox
-		}
-		\backgroundpath{			
-				\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-				\northwest
-				\pgf@circ@res@up = \pgf@y 
-				\pgf@circ@res@down = -\pgf@y
-				\pgf@circ@res@right = -\pgf@x
-				\pgf@circ@res@left = \pgf@x
-			
-				\pgfstartlinewidth=\pgflinewidth
-
-				% draw outer box
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-				\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-				\pgfusepath{draw}
-				
-				% draw inner stuff
-				#2
-				
-				% draw inner text
-				\pgftext[center,x=-0.15\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
-		}
-	}
+    \pgfdeclareshape{#1}{
+        \anchor{center}{
+            \northwest
+            \pgf@x=0pt
+            \pgf@y=0pt
+        }
+        \savedanchor\northwest{%
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=.5\pgf@circ@Rlen
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/width}\pgf@x
+        }
+        \anchor{north}{
+            \northwest
+            \pgf@x=0pt
+        }
+        \anchor{south}{
+            \northwest
+            \pgf@x=0pt
+            \pgf@y=-\pgf@y
+        }
+        \anchor{west}{
+            \northwest
+            \pgf@y=0pt
+        }
+        \anchor{east}{
+            \northwest
+            \pgf@y=0pt
+            \pgf@x=-\pgf@x
+        }
+        \anchor{south west}{
+            \northwest
+            \pgf@y=-\pgf@y
+        }
+        \anchor{north east}{
+            \northwest
+            \pgf@x=-\pgf@x
+        }
+        \anchor{north west}{
+            \northwest
+        }
+        \anchor{south east}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=-\pgf@y
+        }
+        \anchor{port1}{
+            \northwest
+            \pgf@y=-0.5\pgf@y
+        }
+        \anchor{port2}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=-0.5\pgf@y
+        }
+        \anchor{port3}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=0.5\pgf@y
+        }
+        \anchor{port4}{
+            \northwest
+            \pgf@y=0.5\pgf@y
+        }
+        \anchor{1}{
+            \northwest
+            \pgf@y=-0.5\pgf@y
+        }
+        \anchor{2}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=-0.5\pgf@y
+        }
+        \anchor{3}{
+            \northwest
+            \pgf@x=-\pgf@x
+            \pgf@y=0.5\pgf@y
+        }
+        \anchor{4}{
+            \northwest
+            \pgf@y=0.5\pgf@y
+        }
+
+        \anchor{text}{
+            \northwest
+            \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
+            \pgf@x=-.5\wd\pgfnodeparttextbox
+        }
+        \backgroundpath{
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+            \northwest
+            \pgf@circ@res@up = \pgf@y
+            \pgf@circ@res@down = -\pgf@y
+            \pgf@circ@res@right = -\pgf@x
+            \pgf@circ@res@left = \pgf@x
+
+            \pgfstartlinewidth=\pgflinewidth
+
+            % draw outer box
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfusepath{draw}
+
+            % draw inner stuff
+            #2
+
+            % draw inner text
+            \pgftext[center,x=-0.15\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+        }
+    }
 }
 
 % four-port
@@ -542,49 +836,47 @@
 
 % straight coupler
 \pgfcircdeclarefourport{coupler}{
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-	\pgfusepath{draw}
-	
-	\pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-	\pgfsetarrows{latex-latex}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
-	\pgfsetarrows{latex-latex}
-	\pgfusepath{draw}
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
+    \pgfsetarrows{latex-latex}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
+    \pgfsetarrows{latex-latex}
+    \pgfusepath{draw}
 }
 
 % "bended" coupler
 \pgfcircdeclarefourport{coupler2}{
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-	\pgfusepath{draw}
-	
-	\pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@left}{0pt}}
-	\pgfpatharc{0}{90} {0.4\pgf@circ@res@up}
-	\pgfsetarrowsend{latex}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@left}{0pt}}
-	\pgfpatharc{0}{-90} {0.4\pgf@circ@res@up}
-	\pgfsetarrowsend{latex}
-	\pgfusepath{draw}
-	
-	\pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@right}{0pt}}
-	\pgfpatharc{180}{90} {0.4\pgf@circ@res@up}
-	\pgfsetarrowsend{latex}
-	\pgfusepath{draw}
-	\pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@right}{0pt}}
-	\pgfpatharc{-180}{-90} {0.4\pgf@circ@res@up}
-	\pgfsetarrowsend{latex}
-	\pgfusepath{draw}
-	
-	
+    \pgfsetlinewidth{\pgfstartlinewidth}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@left}{0pt}}
+    \pgfpatharc{0}{90} {0.4\pgf@circ@res@up}
+    \pgfsetarrowsend{latex}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@left}{0pt}}
+    \pgfpatharc{0}{-90} {0.4\pgf@circ@res@up}
+    \pgfsetarrowsend{latex}
+    \pgfusepath{draw}
+
+    \pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@right}{0pt}}
+    \pgfpatharc{180}{90} {0.4\pgf@circ@res@up}
+    \pgfsetarrowsend{latex}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{0.1\pgf@circ@res@right}{0pt}}
+    \pgfpatharc{-180}{-90} {0.4\pgf@circ@res@up}
+    \pgfsetarrowsend{latex}
+    \pgfusepath{draw}
 }
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
index e0985bc65b6..82eddb17453 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
@@ -5,244 +5,499 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Other shapes
 
-
 %% Nothing
 
 \pgfdeclareshape{emptyshape}{
-	\savedanchor{\northeast}{%
-		\pgf@x=.5\wd\pgfnodeparttextbox%
-		\pgf@y=.5\ht\pgfnodeparttextbox%
-   }
-	\anchor{north}{
-		\northeast
-		\pgf@x=0cm
-	}
-	\anchor{east}{%
-		\northeast
-		\pgf@y=0cm
-   }
-	\anchor{south}{%
-		\northeast
-		\pgf@y=-\pgf@y
-		\pgf@x=0cm
-   }
-	\anchor{west}{
-		\northeast
-		\pgf@y=0cm
-		\pgf@x=-\pgf@x
-	}
-	\anchor{text}{%
-		\pgfpointorigin
-   }
-	\anchor{center}{
-		\pgfpointorigin
-	}
+    \savedanchor{\northeast}{%
+        \pgf@x=.5\wd\pgfnodeparttextbox%
+        \pgf@y=.5\ht\pgfnodeparttextbox%
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+    \anchor{center}{
+        \pgfpointorigin
+    }
 }
 
 %% Full terminal
 
 \pgfdeclareshape{circ}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchorborder{
-		\pgf@circ@res@left=\pgf@x
-		\pgf@circ@res@up=\pgf@y
-		\pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
-}{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}}		
-	}
-	\behindforegroundpath{		
-		
-		\pgfscope
-			\pgfpathcircle{\pgfpointorigin}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw,fill}		
-		\endpgfscope
-
-		}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgf@x=-\pgf@y
+    }
+    \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{w}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{n}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \anchorborder{
+        \pgf@circ@res@left=\pgf@x
+        \pgf@circ@res@up=\pgf@y
+        \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+        }{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}}
+    }
+    \behindforegroundpath{
+
+        \pgfscope
+            \pgfpathcircle{\pgfpointorigin}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfsetfillopacity{1.0}
+            \pgfusepath{draw,fill}
+        \endpgfscope
+
+    }
 }
 
 %% Empty terminal
 
 \pgfdeclareshape{ocirc}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchorborder{
-		\pgf@circ@res@left=\pgf@x
-		\pgf@circ@res@up=\pgf@y
-		\pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
-}{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}}		
-	}
-
-	\behindforegroundpath{		
-		
-		\pgfscope
-			\pgfpathcircle{\pgfpointorigin}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfsetfillcolor{white}
-			\pgfusepath{draw,fill}		
-		\endpgfscope
-
-		}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgf@x=-\pgf@y
+    }
+    \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{w}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{n}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \anchorborder{
+        \pgf@circ@res@left=\pgf@x
+        \pgf@circ@res@up=\pgf@y
+        \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+        }{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}}
+    }
+
+    \behindforegroundpath{
+
+        \pgfscope
+            \pgfpathcircle{\pgfpointorigin}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \ifx\tikz@fillcolor\pgfutil@empty
+                \pgfsetfillcolor{white}
+            \else
+                \pgfsetfillcolor{\tikz@fillcolor}
+            \fi
+            \pgfsetfillopacity{1.0}
+            \pgfusepath{draw,fill}
+        \endpgfscope
+
+    }
 }
 
 %% Diamond terminal
 
 \pgfdeclareshape{diamondpole}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchorborder{
-		\pgf@circ@res@left=\pgf@x
-		\pgf@circ@res@up=\pgf@y
-	}
-	\behindforegroundpath{		
-		\pgfscope
-			\pgfmathsetlength{\pgf@circ@res@temp}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
-			\pgftransformrotate{45}
-			\pgfpathrectanglecorners
-			{\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@temp}{\pgf@circ@res@up+\pgf@circ@res@temp}}
-			{\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@temp}{\pgf@circ@res@up-\pgf@circ@res@temp}}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw,fill}		
-		\endpgfscope
-		}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgf@x=-\pgf@y
+    }
+    \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{w}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{n}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \anchorborder{
+        \pgf@circ@res@left=\pgf@x
+        \pgf@circ@res@up=\pgf@y
+    }
+    \behindforegroundpath{
+        \pgfscope
+            \pgfmathsetlength{\pgf@circ@res@temp}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+            \pgftransformrotate{45}
+            \pgfpathrectanglecorners
+            {\pgfpoint{\pgf@circ@res@left-\pgf@circ@res@temp}{\pgf@circ@res@up+\pgf@circ@res@temp}}
+            {\pgfpoint{\pgf@circ@res@left+\pgf@circ@res@temp}{\pgf@circ@res@up-\pgf@circ@res@temp}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfsetfillopacity{1.0}
+            \pgfusepath{draw,fill}
+        \endpgfscope
+    }
+}
+
+% BNC connector
+
+\pgfdeclareshape{bnc}{
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    % BNC size is 2.5 times the size of the internal "ocirc"
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgf@y=2.5\pgf@y
+        \pgf@x=-\pgf@y
+    }
+    % center is on the opening
+    \anchor{center}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{zero}{ \pgfpointorigin }
+    \anchor{hot}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{shield}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    % geo-anchors
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{right}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{left}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    % put the node text above and centered
+    \anchor{text}{\pgfextracty{\pgf@circ@res@up}{\northwest}
+        \pgfpoint{-.5\wd\pgfnodeparttextbox}{
+            \dimexpr.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox+\pgf@circ@res@up\relax
+        }
+    }
+    \anchorborder{
+        \pgf@circ@res@left=\pgf@x
+        \pgf@circ@res@up=\pgf@y
+        \pgfpointborderellipse{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}
+        }{\pgfpoint{2.5*\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}{2.5*\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}}
+    }
+    \behindforegroundpath{
+        \pgfextracty{\pgf@circ@res@other}{\northwest}
+        \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetlinewidth{\ctikzvalof{bipoles/thickness}\pgflinewidth}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            % external circle
+            \pgfscope
+                % clipping path: first a rectangle bigger then the shape
+                % to avoid problems with the line thickness
+                \pgfpathrectanglecorners{\pgfpoint{-2\pgf@circ@res@other}{-2\pgf@circ@res@other}}
+                    {\pgfpoint{2\pgf@circ@res@other}{2\pgf@circ@res@other}}
+                % next the opening to the right
+                \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{-\pgf@circ@res@step}}
+                    {\pgfpoint{2\pgf@circ@res@other}{\pgf@circ@res@step}}
+                % do the difference and clip before drawing
+                \pgfseteorule
+                \pgfusepath{clip}
+                \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@other}
+                \pgfusepath{draw}
+            \endpgfscope
+            % internal circle
+            \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@step}
+            \pgf@circ@draworfill
+            % and the contact line to the right
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+            \pgfusepath{draw}
+        \endpgfscope
+    }
 }
 
 %% Fill for correct rectangular joins
 
 \pgfdeclareshape{rectjoinfill}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchorborder{
-		\pgf@circ@res@left=\pgf@x
-		\pgf@circ@res@up=\pgf@y
-	}
-	\behindforegroundpath{		
-		\pgfscope
-			\pgfpathrectanglecorners
-			{\pgfpoint{0}{.5\pgflinewidth}}
-			{\pgfpoint{0}{-.5\pgflinewidth}}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw,fill}		
-		\endpgfscope
-		}
+    \savedanchor{\northeast}{%
+        \pgf@x=.5\pgflinewidth%
+        \pgf@y=.5\pgflinewidth%
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchorborder{
+        \pgf@circ@res@left=\pgf@x
+        \pgf@circ@res@up=\pgf@y
+    }
+    \behindforegroundpath{
+        \pgfscope
+            \pgfpathrectanglecorners
+            {\pgfpoint{0}{.5\pgflinewidth}}
+            {\pgfpoint{0}{-.5\pgflinewidth}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfusepath{draw,fill}
+        \endpgfscope
+    }
 }
 
 
 %% Current arrow
 
 \pgfdeclareshape{currarrow}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-		\anchor{tip}{
-		\pgfpointorigin
-			\pgf@circ@res@step = \pgf@circ@Rlen
-				\divide \pgf@circ@res@step by 16
-		\pgf@x	=\pgf@circ@res@step
-		}
-	\behindforegroundpath{		
-		
-		\pgfscope
-			\pgf@circ@res@step = \pgf@circ@Rlen
-			\divide \pgf@circ@res@step by 16
-
-			\pgfpathmoveto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw,fill}
-
-		\endpgfscope
-	}
-
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+        \pgf@x=.5\pgf@circ@res@step
+        \pgf@y=\pgf@x%
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{tip}{
+        \pgfpointorigin
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+        \pgf@x	=\pgf@circ@res@step
+    }
+    \behindforegroundpath{
+        \pgfscope
+            \pgf@circ@res@step = \pgf@circ@Rlen
+            \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+
+            \pgfpathmoveto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{1\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{-.7\pgf@circ@res@step}{0pt}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfusepath{draw,fill}
+
+        \endpgfscope
+    }
 }
 
 %% Flow arrow
 
 \pgfdeclareshape{flowarrow}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-		\anchor{tip}{
-		\pgfpointorigin
-			\pgf@circ@res@step = \pgf@circ@Rlen
-				\divide \pgf@circ@res@step by 16
-		\pgf@x	=\pgf@circ@res@step
-		}
-	\behindforegroundpath{
-		\pgfscope
-			\pgf@circ@res@step = \pgf@circ@Rlen
-			\divide \pgf@circ@res@step by 4
-			\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{draw}
-			\pgftransformshift{\pgfpoint{\pgf@circ@res@step}{0pt}}
-			\pgfnode{currarrow}{tip}{}{}{\pgfusepath{fill}}
-		\endpgfscope
-	}
+    \savedanchor{\northeast}{%
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+        \pgf@y=.5\pgf@circ@res@step
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by 4
+        \pgf@x=\pgf@circ@res@step%
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{tip}{
+        \pgfpointorigin
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+        \pgf@x	=\pgf@circ@res@step
+    }
+    \behindforegroundpath{
+        \pgfscope
+            \pgf@circ@res@step = \pgf@circ@Rlen
+            \divide \pgf@circ@res@step by 4
+            \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfusepath{draw}
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfnode{currarrow}{tip}{}{}{\pgfusepath{fill}}
+        \endpgfscope
+    }
 }
 
 %% Input arrow
 
 \pgfdeclareshape{inputarrow}{
-	\savedanchor{\tip}{
-		\pgfpointorigin
-	}
-	\anchor{center}{
-		\tip
-	}
-	\anchor{tip}{
-		\tip
-	}
-	\behindforegroundpath{		
-		
-		\pgfscope
-			\pgf@circ@res@step = \pgf@circ@Rlen
-			\divide \pgf@circ@res@step by 16
-
-			\pgfpathmoveto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}
-			\pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{0pt}{0pt}}
-			\pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			\pgfusepath{fill}
-
-		\endpgfscope
-	}
-
+    \savedanchor{\northeast}{% this is really not northeast, really -northwest
+        \pgf@circ@res@step = \pgf@circ@Rlen
+        \divide \pgf@circ@res@step by \pgfkeysvalueof{/tikz/circuitikz/current arrow scale}
+        \pgf@y=.5\pgf@circ@res@step
+        \pgf@x=1.7\pgf@circ@res@step
+    }
+    \anchor{north}{\northeast\pgf@x=0cm\relax}
+    \anchor{east}{\northeast\pgf@y=0cm\relax\pgf@x=0cm\relax}
+    \anchor{south}{\northeast\pgf@y=-\pgf@y \pgf@x=0cm\relax}
+    \anchor{west}{\northeast\pgf@y=0cm\pgf@x=-\pgf@x}
+    \anchor{north east}{\northeast\pgf@x=0cm\relax}
+    \anchor{north west}{\northeast\pgf@x=-\pgf@x}
+    \anchor{south east}{\northeast\pgf@y=-\pgf@y\pgf@x=0cm\relax}
+    \anchor{south west}{\northeast\pgf@y=-\pgf@y\pgf@x=-\pgf@x}
+    \savedanchor{\tip}{
+        \pgfpointorigin
+    }
+    \anchor{center}{
+        \tip
+    }
+    \anchor{tip}{
+        \tip
+    }
+    \behindforegroundpath{
+
+        \pgfscope
+            \pgf@circ@res@step = \pgf@circ@Rlen
+            \divide \pgf@circ@res@step by 16
+
+            \pgfpathmoveto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{-.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{0pt}{0pt}}
+            \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{.8\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{-1.7\pgf@circ@res@step}{0pt}}
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \pgfusepath{fill}
+
+        \endpgfscope
+    }
 }
 
 
 %% box
 
 \pgfdeclareshape{box}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\behindforegroundpath{		
-		
-		\pgfscope
-			\pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@circ@res@step = 0.5\pgf@circ@res@step
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
-			\pgfusepath{draw}
-		\endpgfscope
-	}
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \behindforegroundpath{
+
+        \pgfscope
+            \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@circ@res@step = 0.5\pgf@circ@res@step
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfpathrectanglecorners{\pgfpoint{-\pgf@circ@res@step}{\pgf@circ@res@step}}{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@step}}
+            \pgf@circ@draworfill
+        \endpgfscope
+    }
 
 }
 
+
+% full nodes for wire crossing
+
+\pgfdeclareshape{jump crossing}
+{
+    \savedanchor\northwest{%
+        \pgf@y=\ctikzvalof{bipoles/crossing/size}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgf@y
+    }
+    \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{w}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{n}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \behindbackgroundpath{
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        % horizontal jumper
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0pt}}
+        \pgfpatharc{0}{-180}{0.4*\pgf@circ@res@left}
+        \pgfsetbeveljoin
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        % vertical, broken path
+        \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{0.5\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{0pt}{0.3\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+
+    }
+}
+\pgfdeclareshape{plain crossing}
+{
+    \savedanchor\northwest{%
+        \pgf@y=\ctikzvalof{bipoles/crossing/size}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgf@y
+    }
+    \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+    \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{e}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+    \anchor{west}{ \northwest \pgf@y=0pt }
+    \anchor{w}{ \northwest \pgf@y=0pt }
+    \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{s}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{north}{ \northwest \pgf@x=0pt }
+    \anchor{n}{ \northwest \pgf@x=0pt }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \behindbackgroundpath{
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        % horizontal jumper
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        % vertical, broken path
+        \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{0.1\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{0pt}{0.1\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfusepath{draw}
+
+    }
+}
+
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
index c010dc5acd7..5a0417ed240 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
@@ -5,1377 +5,1507 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Tripoles
 
+\pgfdeclareshape{spdt}{
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{left}{%
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out 1}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{out 2}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \anchor{center}{
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/margin}\pgf@circ@res@left
+
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+
+        \pgfusepath{draw}
 
+        \pgfscope
+            \pgftransformshift{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
+            \pgfnode{ocirc}{center}{}{spdt1}{\pgfusepath{stroke}}
+        \endpgfscope
+        \pgfscope
+            \pgftransformshift{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
+            \pgfnode{ocirc}{center}{}{}{\pgfusepath{stroke}}
+        \endpgfscope
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@other}{0pt}}
+            \pgfnode{ocirc}{center}{}{spdt2}{\pgfusepath{stroke}}
+        \endpgfscope
+
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpointshapeborder{spdt2}{\pgfpointorigin}}
+            \pgfpathlineto{
+                \pgfpointadd{\pgfpointshapeborder{spdt1}{\pgfpoint{-\pgf@circ@res@other}{-100pt}}}
+                {\pgfpoint{-.05\pgf@circ@res@up}{-.05\pgf@circ@res@up}}
+            }
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+    }
+}
+
+
+% cute switch "node" shapes, matching with cute "to" shapes
+% #1 -> name
+% #2 -> barposition
+% #3 -> arrowcode
+\long\def\pgfcircdeclarecutespdt#1#2#3{
+    \pgfdeclareshape{#1}
+    {
+        \savedanchor\northwest{%
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/cuteswitch/height}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/width}\pgf@circ@Rlen
+            \pgf@x=.25\pgf@x
+        }
+        \savedanchor\midlever{
+            % these values are calculated when we create the definition of the shape.
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/cuteswitch/height}\pgf@circ@Rlen
+            \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+            \pgf@circ@res@temp=\ctikzvalof{bipoles/cuteswitch/thickness}\pgf@circ@res@temp
+            \pgf@circ@res@down = -.5\pgf@y
+            \pgf@circ@res@up = .5\pgf@y
+            \pgfextracty{\pgf@circ@res@other}{#2}
+            \pgf@x=0pt
+            \pgf@y=.5\pgf@circ@res@other
+        }
+        % mid of the lever, to stack switches
+        \anchor{mid}{\midlever}
+
+        \anchor{left}{\northwest \pgf@y=0pt }
+        \anchor{in}{ \northwest \pgf@y=0pt}
+        \anchor{out 1}{ \northwest \pgf@x=-\pgf@x }
+        \anchor{out 2}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+        \anchor{center}{ \pgf@y=0pt \pgf@x=0pt }
+        \anchor{east}{ \northwest \pgf@y=0pt \pgf@x=-\pgf@x  }
+        \anchor{west}{ \northwest \pgf@y=0pt }
+        \anchor{south}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+        \anchor{north}{ \northwest \pgf@x=0pt }
+        \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+        \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+        \anchor{north west}{ \northwest }
+        \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+        \backgroundpath{
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            \northwest
+            \pgf@circ@res@up = \pgf@y
+            \pgf@circ@res@down = -\pgf@y
+            \pgf@circ@res@right = -\pgf@x
+            \pgf@circ@res@left = \pgf@x
+
+            \pgfscope
+            % This is the radius of the "ocirc" shape (see pgfcircshapes.tex)
+            \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/nodes width}\pgf@circ@Rlen
+            \pgf@circ@res@temp=\ctikzvalof{bipoles/cuteswitch/thickness}\pgf@circ@res@temp
+            \pgfsetlinewidth{2\pgf@circ@res@temp}
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfpathlineto{#2}
+            \pgfsetroundcap\pgfusepath{draw}
+            \endpgfscope
+            \pgfscope % arrow
+            #3
+            \endpgfscope
+            % terminals
+            \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+            \pgfnode{ocirc}{center}{}{spdt1}{\pgfusepath{stroke}}
+            \endpgfscope
+            \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfnode{ocirc}{center}{}{}{\pgfusepath{stroke}}
+            \endpgfscope
+            \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
+            \pgfnode{ocirc}{center}{}{spdt2}{\pgfusepath{stroke}}
+            \endpgfscope
+
+        }
+    }
+}
+
+\pgfcircdeclarecutespdt{cute spdt up}
+{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up-1.5\pgf@circ@res@temp}}
+{}
+
+\pgfcircdeclarecutespdt{cute spdt mid}
+{\pgfpoint{\pgf@circ@res@right}{0pt}}
+{}
+
+\pgfcircdeclarecutespdt{cute spdt down}
+{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down+1.5\pgf@circ@res@temp}}
+{}
+
+\pgfcircdeclarecutespdt{cute spdt up arrow}
+{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up-1.5\pgf@circ@res@temp}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth}
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
+    \pgfpathmoveto{\pgfpointpolar{70}{1.5\pgf@circ@res@right}}
+    \pgfpatharc{70}{-50}{1.5\pgf@circ@res@right}
+    \pgfsetarrowsend{latexslim}
+    \pgfusepath{draw}
+}
+
+\pgfcircdeclarecutespdt{cute spdt mid arrow}
+{\pgfpoint{\pgf@circ@res@right}{0pt}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth}
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
+    \pgfsetarrowsstart{latexslim}
+    \pgfpathmoveto{\pgfpointpolar{-60}{1.5\pgf@circ@res@right}}
+    \pgfpatharc{-60}{60}{1.5\pgf@circ@res@right}
+    \pgfsetarrowsend{latexslim}
+    \pgfusepath{draw}
+}
+
+\pgfcircdeclarecutespdt{cute spdt down arrow}
+{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down+1.5\pgf@circ@res@temp}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgflinewidth}
+    \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} % in node
+    \pgfpathmoveto{\pgfpointpolar{-50}{1.5\pgf@circ@res@right}}
+    \pgfpatharc{-50}{70}{1.5\pgf@circ@res@right}
+    \pgfsetarrowsend{latexslim}
+    \pgfusepath{draw}
+}
 
-\pgfdeclareshape{spdt}
-	{
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{left}{%
-	  	\northwest
-	  	\pgf@y=0pt
-	  }
-	  \anchor{in}{
-	  	\northwest
-	  	\pgf@y=0pt
-	  }	  
-	  \anchor{out 1}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{out 2}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }
-  	  \anchor{center}{
-		\pgf@y=0pt
-		\pgf@x=0pt
-	  }
-	  \anchor{east}{
-	  	\northwest
-		\pgf@y=0pt
-	  	\pgf@x=-\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x  
-			\pgf@circ@res@left = \pgf@x  
-			\pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/tripoles/spdt/margin}\pgf@circ@res@left
-			
-		
-	  	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	  	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-		
-		\pgfusepath{draw}
-		
-		\pgfscope
-			\pgftransformshift{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-			\pgfnode{ocirc}{center}{}{spdt1}{\pgfusepath{stroke}}
-		\endpgfscope
-		\pgfscope
-			\pgftransformshift{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
-			\pgfnode{ocirc}{center}{}{}{\pgfusepath{stroke}}
-		\endpgfscope
-		\pgfscope
-			\pgftransformshift{\pgfpoint{\pgf@circ@res@other}{0pt}}
-			\pgfnode{ocirc}{center}{}{spdt2}{\pgfusepath{stroke}}
-		\endpgfscope
-		
-		
-		\pgfscope
-			\pgfpathmoveto{\pgfpointshapeborder{spdt2}{\pgfpointorigin}}
-			\pgfpathlineto{
-				\pgfpointadd{\pgfpointshapeborder{spdt1}{\pgfpoint{-\pgf@circ@res@other}{-100pt}}}
-				{\pgfpoint{-.05\pgf@circ@res@up}{-.05\pgf@circ@res@up}}
-			}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-		\endpgfscope
-	  }
-	}
-	
-	
-	
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
 %%       Logic ports
 %%
+%% Code from John Kormylo at tex.stackexchange.com
+%% See https://tex.stackexchange.com/questions/372993/is-it-possible-to-implement-multiple-input-logic-ports-with-circuitikz
+%% Integration and fixes from Romano Giannetti and TheTeXnician <38565529+TheTeXnician@users.noreply.github.com>
+%%
+
+\newcount\pgf@circ@res@count% reserve global register
+
+\def\pgf@circ@logicport@input#1% #1 = \pgfmathcounter
+{%
+    \pgfextracty{\pgf@circ@res@up}{\northeast}%
+    \step
+    \pgf@circ@res@step=\dimexpr 2\pgf@y -2\pgf@circ@res@up\relax
+    \advance\pgf@y by -#1\pgf@circ@res@step\relax
+}%
+
+% #1 = \pgfmathcounter #2=type #3 specificic port
+% type is 1 for and,nand; 2 for or,nor; 3 for xor,xnor, 4 for european.
+\def\pgf@circ@logicport@baseinput#1#2#3%
+{%
+    % and and nand
+    \ifnum #2=1\relax
+        \pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@left}{\southwest}%
+        \step
+        \pgf@circ@res@step=\dimexpr 2\pgf@y -2\pgf@circ@res@up\relax
+        \advance\pgf@y by -#1\pgf@circ@res@step\relax
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/port width}\pgf@circ@res@left
+    \fi
+    % or and nor
+    \ifnum #2=2\relax
+        \pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@left}{\southwest}%
+        \pgfextractx{\pgf@circ@res@right}{\northeast}%
+        \step
+        \pgf@circ@res@step=\dimexpr 2\pgf@y -2\pgf@circ@res@up\relax
+        \advance\pgf@y by -#1\pgf@circ@res@step\relax
+        \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/angle}}%
+        \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/inner}\pgf@circ@res@right
+        \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+        \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up /sin(\pgf@circ@math@angle)}%
+        \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/port width}\pgf@circ@res@right
+        \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+        \pgf@circ@res@temp=\pgf@y
+        \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp/\pgf@circ@math@yradius)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradius*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \pgf@x=\pgf@circ@res@other
+    \fi
+    % xor and xnor
+    \ifnum #2=3\relax
+        \pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@left}{\southwest}%
+        \pgfextractx{\pgf@circ@res@right}{\northeast}%
+        \pgfkeysgetvalue{/tikz/circuitikz/tripoles/american #3 port/angle}{\pgf@circ@math@angle}%
+        \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/inner}\pgf@circ@res@right
+        \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+        \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up / sin(\pgf@circ@math@angle))}%
+        \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/port width}\pgf@circ@res@right
+        \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+        \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #3 port/distance}\pgf@circ@res@right
+        \pgfmathsetlengthmacro{\pgf@circ@math@distance}{\pgf@circ@res@temp}
+        % this compensates for the effect of the line width on the gap between the arcs
+        \pgfmathsetlengthmacro{\pgf@circ@math@yradiusA}{\pgf@circ@math@yradius -2\pgflinewidth}%
+        \pgfmathsetlengthmacro{\pgf@circ@math@xradiusA}{\pgf@circ@math@xradius -2\pgflinewidth}%
+
+        \step
+        \pgf@circ@res@step=\dimexpr 2\pgf@y -2\pgf@circ@res@up\relax
+        \advance\pgf@y by -#1\pgf@circ@res@step\relax
+         \pgf@circ@res@temp=\pgf@y
+            \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp  / \pgf@circ@math@yradiusA)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradiusA*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \advance\pgf@circ@res@other by -\pgf@circ@math@distance
+        \pgf@x=\pgf@circ@res@other
+    \fi
+    % european
+    \ifnum #2=4\relax
+        \pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@other}{\left}%
+        \step
+        \pgf@circ@res@step=\dimexpr 2\pgf@y -2\pgf@circ@res@up\relax
+        \advance\pgf@y by -#1\pgf@circ@res@step\relax
+        \pgf@x=\pgf@circ@res@other
+    \fi
+}%
+
+%%% american
+\long\def\pgfcircdeclarelogicport#1#2#3{%
+    \pgfdeclareshape{american #1 port}%
+    {%
+        \savedmacro\resize{% automatic
+            \pgf@circ@res@up = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/height}\pgf@circ@Rlen
+            \pgf@circ@res@up = .5\pgf@circ@res@up
+            \pgf@circ@res@down = -\pgf@circ@res@up
+            \pgf@circ@res@right = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/width}\pgf@circ@Rlen
+            \pgf@circ@res@right = .5\pgf@circ@res@right
+            \pgf@circ@res@left = -\pgf@circ@res@right
+        }%
+        \savedmacro\inputs{% get number of inputs
+            \pgf@circ@res@count=\pgfkeysvalueof{/tikz/number inputs}\relax%
+            \ifnum\pgf@circ@res@count=0
+                \pgf@circ@res@count=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/inputs}\relax%
+            \fi
+        \ifnum\pgf@circ@res@count<2 \pgf@circ@res@count=2\fi
+    \ifnum\pgf@circ@res@count>16 \pgf@circ@res@count=16\fi
+        \def\inputs{\the\pgf@circ@res@count}%
+    }%
+    \savedanchor\step{% 1/2 gap at edges
+        \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/height}\pgf@circ@Rlen
+        \divide\pgf@circ@res@step by \pgf@circ@res@count
+        \pgfpoint{\pgf@circ@res@left}{\dimexpr\pgf@circ@res@up+0.5\pgf@circ@res@step}%
+    }%
+    \savedanchor\northeast{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \savedanchor\southwest{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+    \savedanchor\left{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/port width}\pgf@circ@res@left}{0pt}}
+    \savedanchor\right{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/port width}\pgf@circ@res@right}{0pt}}
+    \savedanchor\origin{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/origin}\pgf@circ@res@right}{0pt}}
+
+    \anchor{center}{\origin}% for backwards compatibility
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    % create input anchors
+    \expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@american #1 port\endcsname{%
+        \pgfmathloop%
+        \ifnum\pgfmathcounter>\pgf@circ@res@count%
+    \else%
+        %\pgfutil@ifundefined{pgf@anchor@american #1 port@in \pgfmathcounter}{%
+        \expandafter\xdef\csname pgf@anchor@american #1 port@in \pgfmathcounter\endcsname{%
+            \noexpand\pgf@circ@logicport@input{\pgfmathcounter}% defined above
+        }%
+        \expandafter\xdef\csname pgf@anchor@american #1 port@bin \pgfmathcounter\endcsname{%
+            \noexpand\pgf@circ@logicport@baseinput{\pgfmathcounter}{#2}{#1}% defined above
+        }%
+        %}{}%
+        \repeatpgfmathloop%
+    }
+
+    \anchor{out}{\northeast\pgf@y=0pt}
+    \anchor{bout}{\right\pgf@y=0pt}
+
+
+    \anchor{left}{\left}% edges of component mius leads
+    \anchor{right}{\right}
+
+    \anchor{north east}{\northeast}% see \Compass macro
+    \anchor{south west}{\southwest}
+    \anchor{north}{\pgfextracty{\pgf@circ@res@up}{\northeast}%
+    \pgfpoint{0cm}{\pgf@circ@res@up}}
+    \anchor{north west}{\pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@left}{\southwest}%
+    \pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \anchor{west}{\pgfextractx{\pgf@circ@res@left}{\southwest}%
+    \pgfpoint{\pgf@circ@res@left}{0cm}}
+    \anchor{south}{\pgfextracty{\pgf@circ@res@down}{\southwest}%
+    \pgfpoint{0cm}{\pgf@circ@res@down}}
+    \anchor{south east}{\pgfextracty{\pgf@circ@res@down}{\southwest}%
+        \pgfextractx{\pgf@circ@res@right}{\northeast}%
+    \pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \anchor{east}{\pgfextractx{\pgf@circ@res@right}{\northeast}%
+    \pgfpoint{\pgf@circ@res@right}{0cm}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        #3
+    }
+}
+}
+%%% american and %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pgfcircdeclarelogicport{and}{1}{
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@temp}}
+        \advance\pgf@circ@res@count by -1
+        \repeat
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@right}
+    {0pt}}
 
+    \pgfusepath{draw}
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \pgfpatharc{-90}{90}{-2\pgf@circ@res@other and \pgf@circ@res@up}
+    \pgfpathclose
+    \pgf@circ@draworfill
+    }
+%%% american nand %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    \pgfcircdeclarelogicport{nand}{1}{
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@temp}}
+        \advance\pgf@circ@res@count by -1
+    \repeat
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right} {0pt}}
 
+    \pgfusepath{draw}
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+    \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/circle width}\pgf@circ@res@right
+    \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right
+    \pgf@circ@res@temp = \dimexpr 2\pgf@circ@res@other - \pgf@circ@res@step\relax
 
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \pgfpatharc{-90}{90}{\pgf@circ@res@temp and \pgf@circ@res@up}
+    \pgfpathclose
 
-\long\def\pgfcircdeclarelogicport#1#2{
-	\pgfdeclareshape{american #1 port}
-	{
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american #1 port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }	  
-	  \anchor{in 1}{
-		\inOne
-	  }
-	  \anchor{in}{
-		\inOne
-	  }	  
-	  \anchor{in 2}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-  	  \anchor{center}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{east}{
-	  	\left
-	  	\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\left
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-			#2
-	  
-	  }
-	}
+    \pgfpathellipse
+    {\pgfpoint{\pgf@circ@res@other-.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{0pt}{.5\pgf@circ@res@step}}
+
+    \pgf@circ@draworfill
 }
+%%% american nor %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pgfcircdeclarelogicport{nor}{2}{
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/angle}}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/inner}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up /sin(\pgf@circ@math@angle)}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp/\pgf@circ@math@yradius)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradius*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@temp}}%
+        \advance\pgf@circ@res@count by -1
+    \repeat
+
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}\pgf@circ@res@right
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+
+    \pgfusepath{draw}
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
 
-\pgfcircdeclarelogicport{and}{
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@right}
-		{0pt}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
-		{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
-		{\pgf@circ@res@down}}
-	\pgfpathcurveto
-		{\pgfpoint{.0\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@right}
-			{.5\pgf@circ@res@down}}
-		{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@right}
-			{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@right}
-			{.5\pgf@circ@res@up}}
-		{\pgfpoint{.0\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american and port/port width}\pgf@circ@res@left}
-			{\pgf@circ@res@up}}	
-	\pgfusepath{draw}
-}
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/angle}}%
+    \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/circle width}\pgf@circ@res@right
+    \pgf@circ@res@temp = \dimexpr 2\pgf@circ@res@other - \pgf@circ@res@step\relax
+    \advance\pgf@circ@res@other by -\pgf@circ@res@step
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}% for symmetry
+    \pgfpatharc{0}{90}{\pgf@circ@res@temp and \pgf@circ@res@up}%
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradius and \pgf@circ@math@yradius}%
+    \pgfpatharc{-90}{0}{\pgf@circ@res@temp and \pgf@circ@res@up}%
+    \pgfpathclose
 
+    \pgfpathellipse
+    {\pgfpoint{\pgf@circ@res@other+.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{0pt}{.5\pgf@circ@res@step}}
 
-\pgfcircdeclarelogicport{nand}{
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right}
-		{0pt}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{2\pgflinewidth}
-
-	\pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/circle width}\pgf@circ@res@right
-	\pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right
-	
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}
-	\pgfpathcurveto
-		{\pgfpoint{.0\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{.5\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{.5\pgf@circ@res@up}}
-		{\pgfpoint{.0\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}
-			{\pgf@circ@res@up}}	
-	\pgfpathellipse
-		{\pgfpoint{\pgf@circ@res@other-.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{0pt}{.5\pgf@circ@res@step}}
-
-	\pgfusepath{draw}
+    \pgf@circ@draworfill
 }
+%%% american or %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pgfcircdeclarelogicport{or}{2}{
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/angle}}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/inner}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up /sin(\pgf@circ@math@angle)}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp/\pgf@circ@math@yradius)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradius*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@temp}}%
+        \advance\pgf@circ@res@count by -1
+    \repeat
+
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}\pgf@circ@res@right
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/angle}}%
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}% for symmetry
+    \pgfpatharc{0}{90}{2\pgf@circ@res@other and \pgf@circ@res@up}%
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradius and \pgf@circ@math@yradius}%
+    \pgfpatharc{-90}{0}{2\pgf@circ@res@other and \pgf@circ@res@up}%
+    \pgfpathclose
 
-\pgfcircdeclarelogicport{nor}{
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}\pgf@circ@res@right}
-		{0pt}}	
-	
-	\pgfusepath{draw}
-	
-	\pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/port width}\pgf@circ@res@right
-	\pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/circle width}\pgf@circ@res@right
-		
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}	
-
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}	
-		
-	\pgfpathellipse
-		{\pgfpoint{\pgf@circ@res@other-.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{0pt}{.5\pgf@circ@res@step}}
-		
-	\pgfusepath{draw}
+    \pgf@circ@draworfill
 }
+%%% american xor %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pgfcircdeclarelogicport{xor}{3}{
+    \pgfkeysgetvalue{/tikz/circuitikz/tripoles/american xor port/angle}{\pgf@circ@math@angle}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/inner}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up / sin(\pgf@circ@math@angle))}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+    \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/distance}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@distance}{\pgf@circ@res@temp}
+    % this compensates for the effect of the line width on the gap between the arcs
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradiusA}{\pgf@circ@math@yradius -2\pgflinewidth}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradiusA}{\pgf@circ@math@xradius -2\pgflinewidth}%
+
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp  / \pgf@circ@math@yradiusA)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradiusA*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \advance\pgf@circ@res@other by -\pgf@circ@math@distance
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@temp}}%
+        \advance\pgf@circ@res@count by -1
+    \repeat
+
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}\pgf@circ@res@right
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
 
+    \pgfusepath{draw}
 
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
 
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/angle}}%
 
-\pgfcircdeclarelogicport{or}{
-
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}\pgf@circ@res@right}
-		{0pt}}	
-	
-	\pgfusepath{draw}
-	\pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/port width}\pgf@circ@res@right
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/aaa}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/aaa}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}	
-
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ddd}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american or port/ddd}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}	
-	\pgfusepath{draw}
-}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}% for symmetry
+    \pgfpatharc{0}{90}{2\pgf@circ@res@other and \pgf@circ@res@up}%
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradius and \pgf@circ@math@yradius}%
+    \pgfpatharc{-90}{0}{2\pgf@circ@res@other and \pgf@circ@res@up}%
+    \pgfpathclose
+    \pgf@circ@draworfill
 
+    \pgfmathsetlength{\pgf@circ@res@temp}{(\pgf@circ@math@yradiusA)*sin(\pgf@circ@math@angle)}%
 
-\pgfcircdeclarelogicport{xor}{
-
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}\pgf@circ@res@right}
-		{0pt}}	
-	
-	\pgfusepath{draw}
-	\pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/port width}\pgf@circ@res@right
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}	
-
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@res@other}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}	
-		
-	\def\pgf@circ@temp{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/distance}\pgf@circ@res@right+}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@temp-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/aaa}\pgf@circ@res@left}{.95*\pgf@circ@res@up}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/aaa}\pgf@circ@res@left}{.95*\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@temp-\pgf@circ@res@other}{.95*\pgf@circ@res@down}}	
-				
-	\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other-\pgf@circ@math@distance}{\pgf@circ@res@temp}}% first arc
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradiusA and \pgf@circ@math@yradiusA}%
+
+    \pgfusepath{draw}
 }
+%%% american xnor %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pgfcircdeclarelogicport{xnor}{3}{
+    \pgfkeysgetvalue{/tikz/circuitikz/tripoles/american xnor port/angle}{\pgf@circ@math@angle}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/inner}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradius}{\pgf@circ@res@other /(1 - cos(\pgf@circ@math@angle)}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradius}{\pgf@circ@res@up / sin(\pgf@circ@math@angle))}%
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@xorigin}{\pgf@circ@res@other + \pgf@circ@math@xradius*cos(\pgf@circ@math@angle)}%
+    \pgf@circ@res@temp=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xor port/distance}\pgf@circ@res@right
+    \pgfmathsetlengthmacro{\pgf@circ@math@distance}{\pgf@circ@res@temp}
+    % this compensates for the effect of the line width on the gap between the arcs
+    \pgfmathsetlengthmacro{\pgf@circ@math@yradiusA}{\pgf@circ@math@yradius -2\pgflinewidth}%
+    \pgfmathsetlengthmacro{\pgf@circ@math@xradiusA}{\pgf@circ@math@xradius -2\pgflinewidth}%
+
+    \pgfextracty{\pgf@circ@res@temp}{\step}%
+    \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+    \pgf@circ@res@count = \inputs\relax
+    \loop\ifnum\pgf@circ@res@count>0
+        \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+        \pgfmathsetmacro{\pgf@circ@math@angle}{asin(\pgf@circ@res@temp  / \pgf@circ@math@yradiusA)}%
+        \pgfmathsetlength{\pgf@circ@res@other}{\pgf@circ@math@xradiusA*cos(\pgf@circ@math@angle)-\pgf@circ@math@xorigin}%
+        \advance\pgf@circ@res@other by -\pgf@circ@math@distance
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@temp}}%
+        \advance\pgf@circ@res@count by -1
+    \repeat
+
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}\pgf@circ@res@right
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+
+    \edef\pgf@circ@math@angle{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/angle}}%
+    \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/circle width}\pgf@circ@res@right
+    \pgf@circ@res@temp = \dimexpr 2\pgf@circ@res@other - \pgf@circ@res@step\relax
+    \advance\pgf@circ@res@other by -\pgf@circ@res@step
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}% for symmetry
+    \pgfpatharc{0}{90}{\pgf@circ@res@temp and \pgf@circ@res@up}%
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradius and \pgf@circ@math@yradius}%
+    \pgfpatharc{-90}{0}{\pgf@circ@res@temp and \pgf@circ@res@up}%
+    \pgfpathclose
 
+    \pgfpathellipse
+    {\pgfpoint{\pgf@circ@res@other+.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{.5\pgf@circ@res@step}{0pt}}
+    {\pgfpoint{0pt}{.5\pgf@circ@res@step}}
+    \pgf@circ@draworfill
 
-\pgfcircdeclarelogicport{xnor}{
-
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input height}\pgf@circ@res@up}}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{(\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input skip})*\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/input height}\pgf@circ@res@down}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}\pgf@circ@res@right}
-		{0pt}}	
-	
-	\pgfusepath{draw}
-	\pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}\pgf@circ@res@right
-	\pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/circle width}\pgf@circ@res@right
-
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/aaa}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@down}}	
-
-	\pgfpathcurveto
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@res@other-\pgf@circ@res@step}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ddd}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		{\pgfpoint{-\pgf@circ@res@other}{\pgf@circ@res@up}}	
-		
-	\def\pgf@circ@temp{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/distance}\pgf@circ@res@right+}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@temp-\pgf@circ@res@other}{\pgf@circ@res@up}}
-	
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/aaa}\pgf@circ@res@left}{.95*\pgf@circ@res@up}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@up}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{0pt}}
-	\pgfpathcurveto
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/bbb}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/ccc}\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@temp\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/aaa}\pgf@circ@res@left}{.95*\pgf@circ@res@down}}
-		{\pgfpoint{\pgf@circ@temp-\pgf@circ@res@other}{.95*\pgf@circ@res@down}}	
-		
-		
-	\pgfpathellipse
-		{\pgfpoint{\pgf@circ@res@other-.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{.5\pgf@circ@res@step}{0pt}}
-		{\pgfpoint{0pt}{.5\pgf@circ@res@step}}
-				
-	\pgfusepath{draw}
+    \pgf@circ@res@other=\pgfkeysvalueof{/tikz/circuitikz/tripoles/american xnor port/port width}\pgf@circ@res@left
+    \pgfmathsetlength{\pgf@circ@res@temp}{(\pgf@circ@math@yradiusA)*sin(\pgf@circ@math@angle)}%
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other-\pgf@circ@math@distance}{\pgf@circ@res@temp}}% first arc
+    \pgfpatharc{\pgf@circ@math@angle}{-\pgf@circ@math@angle}{\pgf@circ@math@xradiusA and \pgf@circ@math@yradiusA}%
+
+    \pgfusepath{draw}
 }
 
+%%% Original one-input ports
+
+\pgfdeclareshape{american not port}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-.8\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
 
-\pgfdeclareshape{american not port}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{center}{
-	  	\pgfpointorigin
-	  }
-	  \anchor{east}{
-	  	\left
-	  	\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\left
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-		\pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
-						
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfusepath{draw}
-		\pgfpathellipse
-			{\pgfpoint{\pgf@circ@res@step-.5\pgf@circ@res@other}{0pt}}
-			{\pgfpoint{.5\pgf@circ@res@other}{0pt}}
-			{\pgfpoint{0pt}{.5\pgf@circ@res@other}}
-		\pgfusepath{draw}
-	\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	
-		\pgfusepath{draw}
-	  
-	  }
-	}
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+            \pgf@circ@draworfill
+            \pgfpathellipse
+            {\pgfpoint{\pgf@circ@res@step-.5\pgf@circ@res@other}{0pt}}
+            {\pgfpoint{.5\pgf@circ@res@other}{0pt}}
+            {\pgfpoint{0pt}{.5\pgf@circ@res@other}}
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+
+        \pgfusepath{draw}
+
+    }
+}
 
-\pgfdeclareshape{invschmitt}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{center}{
-	  	\pgfpointorigin
-	  }
-	  \anchor{east}{
-	  	\left
-	  	\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\left
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-		\pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
-						
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathclose
-		\pgfusepath{draw}
-		\pgfpathellipse
-			{\pgfpoint{\pgf@circ@res@step-.5\pgf@circ@res@other}{0pt}}
-			{\pgfpoint{.5\pgf@circ@res@other}{0pt}}
-			{\pgfpoint{0pt}{.5\pgf@circ@res@other}}
-				\pgfsetfillcolor{white}
-		\pgfusepath{draw,fill}
-	\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-				\pgfusepath{draw}
-		%draw inner shape
-		
-		\pgfsetlinewidth{2\pgflinewidth}
-		
-		\pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.05\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	  
-	  }
-	}
+\pgfdeclareshape{invschmitt}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-.8\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
 
-\pgfdeclareshape{schmitt}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{center}{
-	  	\pgfpointorigin
-	  }
-	  \anchor{east}{
-	  	\left
-	  	\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\left
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-		\pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
-						
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathclose
-		\pgfusepath{draw}
-	\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-		\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right-\pgf@circ@res@other}{0pt}}
-				\pgfusepath{draw}
-		%draw inner shape
-		
-		\pgfsetlinewidth{2\pgflinewidth}
-		
-		\pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{.05\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	  
-	  }
-	}
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+            \pgfpathellipse
+            {\pgfpoint{\pgf@circ@res@step-.5\pgf@circ@res@other}{0pt}}
+            {\pgfpoint{.5\pgf@circ@res@other}{0pt}}
+            {\pgfpoint{0pt}{.5\pgf@circ@res@other}}
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+        \pgfusepath{draw}
+        %draw inner shape
+
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.05\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+    }
+}
+
+\pgfdeclareshape{schmitt}{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-.8\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgf@circ@res@other = \pgfkeysvalueof{/tikz/circuitikz/bipoles/not port/circle width}\pgf@circ@res@right
 
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@left}{0pt}}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right-\pgf@circ@res@other}{0pt}}
+        \pgfusepath{draw}
+        %draw inner shape
+
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+
+        \pgfpathmoveto{\pgfpoint{.6\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{.05\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{.25\pgf@circ@res@left}{.3\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+    }
+}
 
 
+%%% start european logic ports, from John Kormylo
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
 
 % #1 - name
 % #2 - text inside
 % #3 - number of inputs
-% #4 - is it a not
+% #4 = is it a not?
 
 \long\def\pgfcircdeclareeurologicport#1#2#3#4{
-	\pgfdeclareshape{european #1 port}
-	{
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }	  
-	  \anchor{in}{
-		\inOne
-	  }
-	  \anchor{in 1}{
-		\inOne
-	  }
-	  \anchor{in 2}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-  	  \anchor{center}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{east}{
-	  	\left
-	  	\pgf@x=-.8\pgf@x  
-	  }
-	  \anchor{west}{
-	  	\left
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  \anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	  }
-	  \anchor{north west}{
-		\northwest
-	  }
-	  \anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	  }	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			\def\pgf@temp{1}
-			\def\pgf@circ@temp{#3}
-			\ifx\pgftemp\pgf@circ@temp % one input
-				\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfpathlineto{
-					\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}{0pt}}
-			\else % two inputs
-				\pgfpathmoveto{
-					\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/input height}\pgf@circ@res@up}}
-				\pgfpathlineto{
-					\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/input height}\pgf@circ@res@up}}
-					%
-				\pgfpathmoveto{
-					\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/input height}\pgf@circ@res@down}}
-				\pgfpathlineto{
-					\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/input height}\pgf@circ@res@down}}
-			\fi%
-			%
-			%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-			\pgfpathlineto{
-				\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{0pt}}
-			%
-			\edef\pgf@temp{not}
-			\edef\pgf@circ@temp{#4}
-			\ifx\pgf@temp\pgf@circ@temp % is a not
-				\pgfpathmoveto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/not width}\pgf@circ@res@right}{0pt}}
-				\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/not height}\pgf@circ@res@up}}
-			\fi
-			%
-			\pgfusepath{draw}
-			%
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgftext{#2}
-			%
-			%
-			%
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfpathrectanglecorners
-				{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}{\pgf@circ@res@up}}
-				{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{\pgf@circ@res@down}}
-			\pgfusepath{draw}
-%
-%
-	  }
-	}
+    \pgfdeclareshape{european #1 port}
+    {
+        \savedmacro\resize{% automatic
+            \pgf@circ@res@up = \pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/height}\pgf@circ@Rlen
+            \pgf@circ@res@up = .5\pgf@circ@res@up
+            \pgf@circ@res@down = -\pgf@circ@res@up
+            \pgf@circ@res@right = \pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/width}\pgf@circ@Rlen
+            \pgf@circ@res@right = .5\pgf@circ@res@right
+            \pgf@circ@res@left = -\pgf@circ@res@right
+        }%
+        \savedmacro\inputs{% get number of inputs
+            \pgf@circ@res@count=\pgfkeysvalueof{/tikz/number inputs}\relax%
+            \ifnum\pgf@circ@res@count=0
+                \pgf@circ@res@count=\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/inputs}\relax%
+            \fi
+        \ifnum\pgf@circ@res@count<2 \pgf@circ@res@count=2\fi
+    \ifnum\pgf@circ@res@count>16 \pgf@circ@res@count=16\fi
+        \def\inputs{\the\pgf@circ@res@count}%
+    }%
+    \savedanchor\step{% 1/2 gap at edges
+        \pgf@circ@res@step = \pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/height}\pgf@circ@Rlen
+        \divide\pgf@circ@res@step by #3
+        \pgfpoint{\pgf@circ@res@left}{\dimexpr\pgf@circ@res@up+0.5\pgf@circ@res@step}%
+    }%
+    \savedanchor\northeast{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}%
+    \savedanchor\southwest{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}%
+    \savedanchor\left{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}{0pt}}%
+    \savedanchor\right{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{0pt}}%
+    \savedanchor\origin{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/origin}\pgf@circ@res@right}{0pt}}%
+
+    \anchor{center}{\origin}% for backwards compatibility
+    % the text anchor overlaps the logic symbol
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}%
+    % create input anchors
+    \ifnum#3=1\relax
+        \anchor{in}{\pgfpoint{\pgf@circ@res@left}{0pt}}% or \step
+    \else
+        \expandafter\pgfutil@g@addto@macro\csname pgf@sh@s@european #1 port\endcsname{%
+            \pgfmathloop%
+            \ifnum\pgfmathcounter>#3%
+        \else%
+            %\pgfutil@ifundefined{pgf@anchor@european #1 port@in \pgfmathcounter}{% redundant
+            \expandafter\xdef\csname pgf@anchor@european #1 port@in \pgfmathcounter\endcsname{%
+                \noexpand\pgf@circ@logicport@input{\pgfmathcounter}% defined above
+            }%
+            \expandafter\xdef\csname pgf@anchor@european #1 port@bin \pgfmathcounter\endcsname{%
+                \noexpand\pgf@circ@logicport@baseinput{\pgfmathcounter}{4}{#1}% defined above
+            }%
+            %}{}%
+            \repeatpgfmathloop%
+        }
+    \fi
+    \anchor{out}{\northeast\pgf@y=0pt}
+    \anchor{bout}{\right\pgf@y=0pt}
+
+    \anchor{left}{\left}% edges of component minus leads
+    \anchor{right}{\right}
+
+    \anchor{north east}{\northeast}% see \Compass macro
+    \anchor{south west}{\southwest}
+    \anchor{north}{\pgfextracty{\pgf@circ@res@up}{\northeast}%
+    \pgfpoint{0cm}{\pgf@circ@res@up}}
+    \anchor{north west}{\pgfextracty{\pgf@circ@res@up}{\northeast}%
+        \pgfextractx{\pgf@circ@res@left}{\southwest}%
+    \pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \anchor{west}{\pgfextractx{\pgf@circ@res@left}{\southwest}%
+    \pgfpoint{\pgf@circ@res@left}{0cm}}
+    \anchor{south}{\pgfextracty{\pgf@circ@res@down}{\southwest}%
+    \pgfpoint{0cm}{\pgf@circ@res@down}}
+    \anchor{south east}{\pgfextracty{\pgf@circ@res@down}{\southwest}%
+        \pgfextractx{\pgf@circ@res@right}{\northeast}%
+    \pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \anchor{east}{\pgfextractx{\pgf@circ@res@right}{\northeast}%
+    \pgfpoint{\pgf@circ@res@right}{0cm}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgfpathrectanglecorners
+            {\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}{\pgf@circ@res@up}}
+            {\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgf@circ@draworfill
+        \endpgfscope
+        \ifnum#3=1\relax
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}%
+            \pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}{0pt}}%
+        \else
+            \pgfextracty{\pgf@circ@res@temp}{\step}%
+            \pgf@circ@res@step = \dimexpr 2\pgf@circ@res@temp -2\pgf@circ@res@up\relax
+            %\pgf@circ@res@count = #3\relax% redundant
+            \loop\ifnum\pgf@circ@res@count>0
+                \advance\pgf@circ@res@temp by -\pgf@circ@res@step
+                \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}}%
+                \pgfpathlineto{\pgfpoint
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@left}
+                {\pgf@circ@res@temp}}
+                \advance\pgf@circ@res@count by -1
+                \repeat
+            \fi
+            %
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+            \pgfpathlineto{%
+            \pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}{0pt}}
+            %
+            \edef\pgf@temp{not}
+            \edef\pgf@circ@temp{#4}
+            \ifx\pgf@temp\pgf@circ@temp % is a not
+                \pgfpathmoveto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/not width}\pgf@circ@res@right}{0pt}}
+                \pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/reserved}\pgf@circ@res@right}%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/european #1 port/not height}\pgf@circ@res@up}}
+            \fi
+            %
+            \pgfusepath{draw}
+            %
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgftext{#2}
+            %
+            %
+            %
+        }
+    }
 }
-
-
-
-\pgfcircdeclareeurologicport{and}{$\&$}{2}{}
-\pgfcircdeclareeurologicport{or}{$\ge 1$}{2}{}
-\pgfcircdeclareeurologicport{xor}{$=1$}{2}{}
+\pgfcircdeclareeurologicport{and}{\&}{\pgf@circ@res@count}{}
+\pgfcircdeclareeurologicport{or}{$\ge 1$}{\pgf@circ@res@count}{}
+\pgfcircdeclareeurologicport{xor}{$=1$}{\pgf@circ@res@count}{}
 \pgfcircdeclareeurologicport{not}{$1$}{1}{not}
-\pgfcircdeclareeurologicport{nand}{$\&$}{2}{not}
-\pgfcircdeclareeurologicport{nor}{$\ge 1$}{2}{not}
-\pgfcircdeclareeurologicport{xnor}{$=1$}{2}{not}
+\pgfcircdeclareeurologicport{nand}{\&}{\pgf@circ@res@count}{not}
+\pgfcircdeclareeurologicport{nor}{$\ge 1$}{\pgf@circ@res@count}{not}
+\pgfcircdeclareeurologicport{xnor}{$=1$}{\pgf@circ@res@count}{not}
+
+%% end european logic ports
 
 \long\def\pgfcircdeclaretransistor#1#2#3{
-	\pgfdeclareshape{#1}
-	{
-	\anchor{center}{
-		 \pgfpointorigin
-	 }
-	\savedanchor\northeast{% upper right
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=0pt
-	}
-	\savedanchor\left{%center left
-	  	\pgf@y=0pt
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/width}\pgf@circ@Rlen
-	}
-	\anchor{text}{
-	 \northeast
-	 \pgf@y=.7\pgf@y
-	 \pgf@x= \pgf@circ@Rlen
-	 \pgf@x=0.1\pgf@x
-	}
-	\anchor{pathstart}{ % south
-		  	\northeast
-			\pgf@y=-\pgf@y
-	}
-	\anchor{pathend}{
-		  	\northeast
-	}  
-	\anchor{north}{
-			\northeast
-			\pgf@circ@res@step=\pgf@y
-			\left
-			\pgf@y=\pgf@circ@res@step
-			\pgf@x=.5\pgf@x
-		}  
-	 \anchor{west}{
-			\left
-	 }
-	 \anchor{east}{
-		  	\northeast
-			\pgf@y=0pt
-	 }  
-	\anchor{south}{
-			\northeast
-			\pgf@circ@res@step=\pgf@y
-			\left
-			\pgf@y=-\pgf@circ@res@step
-			\pgf@x=.5\pgf@x
-	}
-	\anchor{south west}{
-			\northeast
-			\pgf@circ@res@step=\pgf@y
-			\left
-			\pgf@y=-\pgf@circ@res@step
-	}
-	\anchor{north east}{
-		\northeast
-	}
-	\anchor{north west}{
-			\northeast
-			\pgf@circ@res@step=\pgf@y
-			\left
-			\pgf@y=\pgf@circ@res@step
-	}
-	\anchor{south east}{
-		\northeast
-		\pgf@y=-\pgf@y
-	}
-	\anchor{B}{
-			 \northeast
-	         \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
-	         \left
-	         \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
-	}
-	\anchor{base}{
-			 \northeast
-	         \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
-	         \left
-	         \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
-	}
-		\anchor{G}{
-	         \northeast
-	         \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
-	         \left
-	         \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
-		}
-		\anchor{gate}{
-	         \northeast
-	         \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
-	         \left
-	         \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
-		}	
-	 \anchor{nobase}{
-	 		 	\left
-	 		 	\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@x
-	 }
-	 	\anchor{nogate}{
-	 		\left
-	 		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@x
-	 	}	
-	 	\anchor{E}{
-	 		\northeast
-	 		\pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{emitter}{
-	 		\northeast
-	 		\pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{C}{
-	 		\northeast
-	 		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{collector}{
-	 		\northeast
-	 		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{S}{
-	 		\northeast
-	 		\pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{source}{
-	 		\northeast
-	 		\pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{D}{
-	 		\northeast
-	 		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}
-	 	\anchor{drain}{
-	 		\northeast
-	 		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
-	 	}	
-	  #2
-	  \backgroundpath{
-	  	\pgftransformationadjustments		
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			%
-			\ifnum \pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction} > 0
-				\pgf@circuit@trans@ntypetrue
-			\else
-				\pgf@circuit@trans@ntypefalse
-			\fi
-			\northeast
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = \pgf@x
-			\left
-			\pgf@circ@res@left = \pgf@x
-			%
-			#3
-			% BODY DIODE
-			\ifpgf@circuit@fet@bodydiode
-			\drawbodydiode{#1}
-			\fi
-	  %
-	  }
-	}
+    \pgfdeclareshape{#1}
+    {
+        \anchor{center}{
+            \pgfpointorigin
+        }
+        \savedanchor\northeast{% upper right
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/height}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=0pt
+        }
+        \savedanchor\left{%center left
+            \pgf@y=0pt
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/width}\pgf@circ@Rlen
+        }
+        \anchor{text}{
+            \northeast
+            \pgf@y=.7\pgf@y
+            \pgf@x= \pgf@circ@Rlen
+            \pgf@x=0.1\pgf@x
+        }
+        \anchor{pathstart}{ % south
+            \northeast
+            \pgf@y=-\pgf@y
+        }
+        \anchor{pathend}{
+            \northeast
+        }
+        \anchor{north}{
+            \northeast
+            \pgf@circ@res@step=\pgf@y
+            \left
+            \pgf@y=\pgf@circ@res@step
+            \pgf@x=.5\pgf@x
+        }
+        \anchor{west}{
+            \left
+        }
+        \anchor{east}{
+            \northeast
+            \pgf@y=0pt
+        }
+        \anchor{south}{
+            \northeast
+            \pgf@circ@res@step=\pgf@y
+            \left
+            \pgf@y=-\pgf@circ@res@step
+            \pgf@x=.5\pgf@x
+        }
+        \anchor{south west}{
+            \northeast
+            \pgf@circ@res@step=\pgf@y
+            \left
+            \pgf@y=-\pgf@circ@res@step
+        }
+        \anchor{north east}{
+            \northeast
+        }
+        \anchor{north west}{
+            \northeast
+            \pgf@circ@res@step=\pgf@y
+            \left
+            \pgf@y=\pgf@circ@res@step
+        }
+        \anchor{south east}{
+            \northeast
+            \pgf@y=-\pgf@y
+        }
+        \anchor{B}{
+            \northeast
+            \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{base}{
+            \northeast
+            \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{G}{
+            \northeast
+            \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{gate}{
+            \northeast
+            \pgf@circ@res@step=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{nobase}{
+            \left
+            \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@x
+        }
+        \anchor{nogate}{
+            \left
+            \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@x
+        }
+        \anchor{E}{
+            \northeast
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{emitter}{
+            \northeast
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{C}{
+            \northeast
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{collector}{
+            \northeast
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{S}{
+            \northeast
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{source}{
+            \northeast
+            \pgf@y=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{D}{
+            \northeast
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        \anchor{drain}{
+            \northeast
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction}\pgf@y
+        }
+        #2
+        \backgroundpath{
+            \pgftransformationadjustments
+            \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+            %
+            \ifnum \pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/curr direction} > 0
+            \pgf@circuit@trans@ntypetrue
+            \else
+            \pgf@circuit@trans@ntypefalse
+        \fi
+        \northeast
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = \pgf@x
+        \left
+        \pgf@circ@res@left = \pgf@x
+        %
+        #3
+        % BODY DIODE
+        \ifpgf@circuit@fet@bodydiode
+            \drawbodydiode{#1}
+        \fi
+        %
+    }
+}
 }
 
 \long\def\drawbodydiode#1{
-        \pgfscope
-	         \pgftransformshift{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
-	        \pgftransformrotate{90}
-			\pgftransformscale{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode scale}}
-			\ifpgf@circuit@fulldiode
-				\pgfnode{fulldiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}}
-			\else
-				\pgfnode{emptydiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}}
-			\fi
-		\endpgfscope
-		%Draw upper connection to body diode
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}
-						{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}
-						{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
-			 	\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{east}}
-		\pgfusepath{draw}
-		\pgfscope
-	        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}
-        	       {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
-   	       	\pgftransformscale{0.5}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
+        \pgftransformrotate{90}
+        \pgftransformscale{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode scale}}
+        \ifpgf@circuit@fulldiode
+            \pgfnode{fulldiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}}
+        \else
+            \pgfnode{emptydiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}}
+        \fi
+    \endpgfscope
+    % Draw stroke line
+    \ifpgf@circuit@strokediode
+        \pgfpathmoveto{\pgfpointanchor{pgf@bodydiode}{west}}
+        \pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{east}}
+        \pgfusepath{stroke}
+    \fi
+    %Draw upper connection to body diode
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{east}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@up}}
+        \pgftransformscale{0.5}
+        \pgfnode{circ}{center}{}{}{\pgfusepath{fill}}
+    \endpgfscope{}
+    %Draw lower connection to body diode
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{west}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}		        	       {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
+        \pgftransformscale{0.5}
         \pgfnode{circ}{center}{}{}{\pgfusepath{fill}}
-      \endpgfscope{}
-   		%Draw lower connection to body diode
-	   \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}
-	        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode distance}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
-			 	\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{west}}
-		\pgfusepath{draw}
-		\pgfscope
-      \pgftransformshift{\pgfpoint{\pgf@circ@res@right}		        	       {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/bodydiode conn}\pgf@circ@res@down}}
-  	       		\pgftransformscale{0.5}
-      \pgfnode{circ}{center}{}{}{\pgfusepath{fill}}
     \endpgfscope
 }
 
 \long\def\declarebpt#1{
-	\pgfcircdeclaretransistor{#1}{}{
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	
-		\pgfscope
-		\pgfpathmoveto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgfusepath{draw}
-		\endpgfscope
-		
-		\pgfpathmoveto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}		
-		\pgfusepath{draw}
-		%draw arrow depending on type of transiytor
-	 	\pgfscope
-	 	\pgfslopedattimetrue
-	 	\pgfallowupsidedownattimetrue
-	 	\pgfresetnontranslationattimefalse
-		\ifpgf@circuit@trans@ntype
-		 	\pgftransformlineattime{.5}{%
-		 		\pgfpoint%
-		 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
-		 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@down}%
-		 	}{%
-		 		\pgfpoint{\pgf@circ@res@right}%
-		 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}%
-		 	}
-		\else
-		 	\pgftransformlineattime{.5}{%
-		 		\pgfpoint{\pgf@circ@res@right}%
-		 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}%
-		 		}{%
-		 		\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
-		 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@up}%
-		 		}
-		\fi
-		\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-		\endpgfscope
-	
-		\ifpgf@circuit@bpt@drawphoto
-					\pgfscope
-					\pgfsetarrowsstart{latex'}
-					\pgfpathmoveto{\pgfpointadd{\pgfpoint
-										{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-										{\pgf@circ@res@up+\pgf@circ@res@down}}
-										{\pgfpoint{0.05\pgf@circ@res@left}{0.1\pgf@circ@res@up}}}
-					\pgfpathlineto{\pgfpointadd{\pgfpoint
-										{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-										{\pgf@circ@res@up+\pgf@circ@res@down}}
-										{\pgfpoint{0.5\pgf@circ@res@left}{0.3\pgf@circ@res@up}}}
-					\pgfusepath{draw}
-					\pgfpathmoveto{\pgfpointadd{\pgfpoint
-										{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-										{\pgf@circ@res@up+\pgf@circ@res@down}}
-										{\pgfpoint{0.05\pgf@circ@res@left}{-0.1\pgf@circ@res@up}}}
-					\pgfpathlineto{\pgfpointadd{\pgfpoint
-										{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-										{\pgf@circ@res@up+\pgf@circ@res@down}}
-										{\pgfpoint{0.5\pgf@circ@res@left}{0.1\pgf@circ@res@up}}}
-					\pgfusepath{draw}
-					\endpgfscope
-		\else
-		\ifpgf@circuit@bpt@drawbase
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
-		\fi
-		\fi
-	}
+    \pgfcircdeclaretransistor{#1}{}{
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+        \pgfscope
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfusepath{draw}
+        %draw arrow depending on type of transistor
+        \pgfscope
+            \pgfslopedattimetrue
+            \pgfallowupsidedownattimetrue
+            \pgfresetnontranslationattimefalse
+            \ifpgf@circuit@trans@ntype
+                \pgftransformlineattime{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/arrow pos}}{%
+                    \pgfpoint%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@down}%
+                    }{%
+                    \pgfpoint{\pgf@circ@res@right}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}%
+                }
+            \else
+                \pgftransformlineattime{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/arrow pos}}{%
+                    \pgfpoint{\pgf@circ@res@right}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}%
+                    }{%
+                    \pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height 2}\pgf@circ@res@up}%
+                }
+            \fi
+            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+        \endpgfscope
+
+        \ifpgf@circuit@bpt@drawphoto
+            \pgfscope
+                \pgfsetarrowsstart{latexslim}
+                \pgfpathmoveto{\pgfpointadd{\pgfpoint
+                        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+                    {\pgf@circ@res@up+\pgf@circ@res@down}}
+                {\pgfpoint{0.05\pgf@circ@res@left}{0.1\pgf@circ@res@up}}}
+                \pgfpathlineto{\pgfpointadd{\pgfpoint
+                        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+                    {\pgf@circ@res@up+\pgf@circ@res@down}}
+                {\pgfpoint{0.5\pgf@circ@res@left}{0.3\pgf@circ@res@up}}}
+                \pgfusepath{draw}
+                \pgfpathmoveto{\pgfpointadd{\pgfpoint
+                        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+                    {\pgf@circ@res@up+\pgf@circ@res@down}}
+                {\pgfpoint{0.05\pgf@circ@res@left}{-0.1\pgf@circ@res@up}}}
+                \pgfpathlineto{\pgfpointadd{\pgfpoint
+                        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+                    {\pgf@circ@res@up+\pgf@circ@res@down}}
+                {\pgfpoint{0.5\pgf@circ@res@left}{0.1\pgf@circ@res@up}}}
+                \pgfusepath{draw}
+            \endpgfscope
+            \else
+            \ifpgf@circuit@bpt@drawbase
+                \pgfpathmoveto{\pgfpoint
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+                {\pgf@circ@res@up+\pgf@circ@res@down}}
+                \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
+                \pgfusepath{draw}
+            \fi
+        \fi
+    }
 }
 
 \declarebpt{npn}
 \declarebpt{pnp}
 
 \long\def\declareigbt#1{
-\pgfcircdeclaretransistor{#1}{}
-{
-	%draw upper connection
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@up}}
-	\pgfusepath{draw}
-
-	%draw thicker gate lines
-	\pgfscope
-	\pgfpathmoveto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}}
-	\pgfpathmoveto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}}
-	\pgfsetlinewidth{2\pgflinewidth}
-	\pgfusepath{draw}
-	\endpgfscope
-	%draw lower connection		
-	\pgfpathmoveto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}		
-	\pgfusepath{draw}
-	%draw arrow depending on type of transiytor
- 	\pgfscope
- 	\pgfslopedattimetrue
- 	\pgfallowupsidedownattimetrue
- 	\pgfresetnontranslationattimefalse
-	\ifpgf@circuit@trans@ntype
-	 	\pgftransformlineattime{.5}{%
-	 		\pgfpoint%
-	 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
-	 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@down}%
-	 	}{%
-	 		\pgfpoint{\pgf@circ@res@right}%
-	 			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}%
-	 	}
-	\else
-	 	\pgftransformlineattime{.5}{%
-	 		\pgfpoint{\pgf@circ@res@right}%
-	 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}%
-	 		}{%
-	 		\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
-	 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@up}%
-	 		}
-	\fi
-	\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-	\endpgfscope
-	%draw gate
-	\ifpgf@circuit@trans@ntype	
-		\pgfpathmoveto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}%
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}				
-	\else
-		\pgfpathmoveto{\pgfpoint
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-			{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}%
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@up}}			
-	\fi
-	\pgfusepath{draw}
-}
+    \pgfcircdeclaretransistor{#1}{}
+    {
+        %draw upper connection
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+        %draw thicker gate lines
+        \pgfscope
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}}
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}}
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5\pgflinewidth}}
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5\pgflinewidth}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgfusepath{draw}
+        \endpgfscope
+        %draw lower connection
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfusepath{draw}
+        %draw arrow depending on type of transiytor
+        \pgfscope
+            \pgfslopedattimetrue
+            \pgfallowupsidedownattimetrue
+            \pgfresetnontranslationattimefalse
+            \ifpgf@circuit@trans@ntype
+                \pgftransformlineattime{.5}{%
+                    \pgfpoint%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@down}%
+                    }{%
+                    \pgfpoint{\pgf@circ@res@right}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}%
+                }
+            \else
+                \pgftransformlineattime{.5}{%
+                    \pgfpoint{\pgf@circ@res@right}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}%
+                    }{%
+                    \pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
+                    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height 2}\pgf@circ@res@up}%
+                }
+            \fi
+            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+        \endpgfscope
+        %draw gate
+        \ifpgf@circuit@trans@ntype
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+        \else
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@up}}
+        \fi
+        \pgfusepath{draw}
+    }
 }
 
 \declareigbt{pigbt}
@@ -1385,247 +1515,282 @@
 
 
 \pgfcircdeclaretransistor{nmos}{}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
-
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-			\pgfusepath{draw}
-			
-			\pgfscope
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base height}\pgf@circ@res@down}}
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-			\endpgfscope
-		\ifpgf@circuit@mos@arrows
-			\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgfresetnontranslationattimefalse
-			\pgftransformlineattime{.6}{%
-				\pgfpoint%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}%
-			}{%
-				\pgfpoint
-					{\pgf@circ@res@right}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}%
-			}
-			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-			\endpgfscope
-		\fi
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
 
-		\ifpgf@circuit@bpt@drawgate			
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
-		\fi
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base height}\pgf@circ@res@down}}
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+    \ifpgf@circuit@mos@arrows
+        \pgfscope
+            \pgfslopedattimetrue
+            \pgfallowupsidedownattimetrue
+            \pgfresetnontranslationattimefalse
+            \pgftransformlineattime{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/arrow pos}}{%
+                \pgfpoint%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}%
+                }{%
+                \pgfpoint
+                {\pgf@circ@res@right}%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate height}\pgf@circ@res@down}%
+            }
+            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+        \endpgfscope
+    \fi
+
+    \ifpgf@circuit@bpt@drawgate
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/gate width}\pgf@circ@res@left}
+        {\pgf@circ@res@up+\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \fi
 }
 
 
 \pgfcircdeclaretransistor{pmos}{}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
-			\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
+    \pgfusepath{draw}
 
-		\ifpgf@circuit@mos@arrows
-			\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgfresetnontranslationattimefalse
-			\pgftransformlineattime{.4}{%
-				\pgfpoint%
-					{\pgf@circ@res@right}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}%
-			}{%
-				\pgfpoint
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}%
-			}
-			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-			\endpgfscope
-		\fi
+    \ifpgf@circuit@mos@arrows
+        \pgfscope
+            \pgfslopedattimetrue
+            \pgfallowupsidedownattimetrue
+            \pgfresetnontranslationattimefalse
+            \pgftransformlineattime{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/arrow pos}}{%
+                \pgfpoint%
+                {\pgf@circ@res@right}%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}%
+                }{%
+                \pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}%
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}%
+            }
+            \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+        \endpgfscope
+    \fi
 
-			\pgfscope
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base height}\pgf@circ@res@down}}
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-			\endpgfscope
-			
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}		
-
-
-			\pgfusepath{draw}		
-			\ifpgf@circuit@bpt@drawgate
-				\pgfpathmoveto{\pgfpoint
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
-					{\pgf@circ@res@up+\pgf@circ@res@down}}
-				\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
-				\pgfusepath{draw}
-			\fi
-			\pgfpathcircle{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left - \pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
-			\ifpgf@circuit@pmos@emptycircle
-				\pgfsetfillcolor{white}
-			\fi
-			\pgfusepath{draw,fill}		
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base height}\pgf@circ@res@down}}
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+
+
+    \pgfusepath{draw}
+    \ifpgf@circuit@bpt@drawgate
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left}
+        {\pgf@circ@res@up+\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \fi
+    \pgfpathcircle{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left - \pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+    {\pgf@circ@res@up+\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgf@circ@Rlen}
+    \ifpgf@circuit@pmos@emptycircle
+        \pgfsetfillcolor{white}
+    \fi
+    \pgfusepath{draw,fill}
+}
+
+%% HEMT FET Transistor
+\pgfcircdeclaretransistor{hemt}{}{%
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/gate height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/gate height}\pgf@circ@res@up}}
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base height}\pgf@circ@res@down}}
+        \pgfsetlinewidth{2\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/hemt/base width}\pgf@circ@res@left}
+    {\pgf@circ@res@up+\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgf@circ@res@up+\pgf@circ@res@down}}
+    \pgfusepath{draw}
 }
 
 \long\def\drawfetcore#1{
-	\pgftransformationadjustments
-		%top connection
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
-		\pgfusepath{draw}
-		\pgfscope
-      \pgfpathmoveto{\pgfpoint
+    \pgftransformationadjustments
+    %top connection
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up}}
-		\ifpgf@circuit@trans@depletiontype
-		      \pgfpathlineto{\pgfpoint
-		        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-		        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
-		\else
-
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up*0.45}}
-      \pgfpathmoveto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up*0.25}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down*0.25}}
-      \pgfpathmoveto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nfet/base height}\pgf@circ@res@down*0.45}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
+        \ifpgf@circuit@trans@depletiontype
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
+        \else
+
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up*0.45}}
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@up*0.25}}
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down*0.25}}
+            \pgfpathmoveto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nfet/base height}\pgf@circ@res@down*0.45}}
+            \pgfpathlineto{\pgfpoint
+                {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base height}\pgf@circ@res@down}}
         \fi
-      \pgfsetlinewidth{2\pgflinewidth}
-		\pgfusepath{draw}
-		\endpgfscope
-		%Bulk connection line
-      \pgfpathmoveto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgf@circ@res@up+\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
-        {\pgf@circ@res@up+\pgf@circ@res@down}}
-      
-      %bottom connection
-      \pgfpathmoveto{\pgfpoint
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+    %Bulk connection line
+    \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-       {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}    
-      \pgfusepath{draw}
-     
-     %draw thick gate line 
-    \pgfscope
+    {\pgf@circ@res@up+\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
+    {\pgf@circ@res@up+\pgf@circ@res@down}}
+
+    %bottom connection
     \pgfpathmoveto{\pgfpoint
-      {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-      {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-    \pgfpathlineto{\pgfpoint
-      {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-      {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-    \pgfsetlinewidth{2\pgflinewidth}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
     \pgfusepath{draw}
+
+    %draw thick gate line
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
     \endpgfscope
-    
-      \pgfscope
-          \pgfslopedattimetrue 
-          \pgfallowupsidedownattimetrue
-          \pgfresetnontranslationattimefalse
-          
-          \pgftransformlineattime{.6}{%
+
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgfresetnontranslationattimefalse
+
+        \pgftransformlineattime{.6}{%
             \pgfpoint
-              {\pgf@circ@res@right}%
-              {\pgf@circ@res@up+\pgf@circ@res@down}%
-          }{%
+            {\pgf@circ@res@right}%
+            {\pgf@circ@res@up+\pgf@circ@res@down}%
+            }{%
             \pgfpoint%
-              {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
-              {\pgf@circ@res@up+\pgf@circ@res@down}%
-          }
-          	  \ifpgf@circuit@trans@ntype
-          	  \else
-          	  \pgftransformrotate{180}
-          	  \fi
-          \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-          \endpgfscope
-      
-      	% GATE CONNECTION
-      	\ifpgf@circuit@bpt@drawgate
-			\ifpgf@circuit@trans@ntype
-		      	\pgfpathmoveto{\pgfpoint
-		      		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-		      		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
-		      	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
-	      	\else
-		      	\pgfpathmoveto{\pgfpoint
-		      		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
-		      		{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
-		      	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}      	
-	      	\fi
-      	\pgfusepath{draw}
-      	\fi
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left}%
+            {\pgf@circ@res@up+\pgf@circ@res@down}%
+        }
+        \ifpgf@circuit@trans@ntype
+    \else
+        \pgftransformrotate{180}
+    \fi
+    \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+\endpgfscope
+
+% GATE CONNECTION
+\ifpgf@circuit@bpt@drawgate
+    \ifpgf@circuit@trans@ntype
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+    \else
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left}
+        {-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/conn height}\pgf@circ@res@down}}
+    \fi
+    \pgfusepath{draw}
+\fi
 
 }
 
 \long\def\pgfdeclaretransistorwrapperaddbulk#1#2#3
 {\pgfcircdeclaretransistor{#1}{
-	\anchor{bulk}{\left\pgf@x=0pt}
- 	\anchor{B}{\left\pgf@x=0pt}%override Base anchor from npn&igbt
-	 #2
-	 }
-	 {#3}
+        \anchor{bulk}{\left\pgf@x=0pt}
+        \anchor{B}{\left\pgf@x=0pt}%override Base anchor from npn&igbt
+        #2
+    }
+    {#3}
 }
 
 
@@ -1636,28 +1801,28 @@
 
 
 \pgfdeclaretransistorwrapperaddbulk{pfet}{}{%
-	\pgf@circuit@trans@depletiontypefalse
-	\drawfetcore{pfet}
+    \pgf@circuit@trans@depletiontypefalse
+    \drawfetcore{pfet}
 }
 
 % N-CHANNEL IGFET ENHANCEMENT TYPE
-\pgfdeclaretransistorwrapperaddbulk{nigfete}{}{%	
-	\pgf@circuit@trans@depletiontypefalse
-	\drawfetcore{nigfete}
-	     
-      % SOURCE CONNECTION
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}    
-      \pgfusepath{draw}
-      
-      % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope{}
-      \fi
+\pgfdeclaretransistorwrapperaddbulk{nigfete}{}{%
+    \pgf@circuit@trans@depletiontypefalse
+    \drawfetcore{nigfete}
+
+    % SOURCE CONNECTION
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    % SOLDER DOT at source-bulk connection
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
+            \pgfnode{circ}{center}{}{}{}
+    \endpgfscope{}
+\fi
 }
 
 
@@ -1665,296 +1830,284 @@
 
 % N-CHANNEL IGFET ENHANCEMENT TYPE with Bulk connector
 \pgfdeclaretransistorwrapperaddbulk{nigfetebulk}{}{%
-	\pgf@circuit@trans@depletiontypefalse
-	\drawfetcore{nigfetebulk}
+    \pgf@circuit@trans@depletiontypefalse
+    \drawfetcore{nigfetebulk}
     % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate height}\pgf@circ@res@down}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope{}
-      \fi
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate height}\pgf@circ@res@down}}
+            \pgfnode{circ}{center}{}{}{}
+        \endpgfscope{}
+    \fi
 }
 
 
 
 % N-CHANNEL IGFET DEPLETION TYPE
 \pgfdeclaretransistorwrapperaddbulk{nigfetd}{}{%
-	\pgf@circuit@trans@depletiontypetrue
-	\drawfetcore{nigfetd}
-
-      % SOURCE CONNECTION
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}    
-      \pgfusepath{draw}
-             
-      % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope{}
-      \fi
+    \pgf@circuit@trans@depletiontypetrue
+    \drawfetcore{nigfetd}
+
+    % SOURCE CONNECTION
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+    \pgfusepath{draw}
+
+    % SOLDER DOT at source-bulk connection
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
+            \pgfnode{circ}{center}{}{}{}
+        \endpgfscope{}
+    \fi
 }
 
 % P-CHANNEL IGFET ENHANCEMENT TYPE
 \pgfdeclaretransistorwrapperaddbulk{pigfete}{}{%
-	\pgf@circuit@trans@depletiontypefalse
-	\drawfetcore{pigfete}
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    
-      % SOURCE CONNECTION
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}    
-      \pgfusepath{draw}
-      
-      
-      % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfete/gate height}\pgf@circ@res@up}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope
-      \fi
+    \pgf@circuit@trans@depletiontypefalse
+    \drawfetcore{pigfete}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+
+    % SOURCE CONNECTION
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+
+    % SOLDER DOT at source-bulk connection
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfete/gate height}\pgf@circ@res@up}}
+            \pgfnode{circ}{center}{}{}{}
+        \endpgfscope
+    \fi
 }
 
 % P-CHANNEL IGFET ENHANCEMENT TYPE with bulk connector
 \pgfdeclaretransistorwrapperaddbulk{pigfetebulk}{}{%
-	\pgf@circuit@trans@depletiontypefalse
-	\drawfetcore{pigfetebulk}
+    \pgf@circuit@trans@depletiontypefalse
+    \drawfetcore{pigfetebulk}
 }
 
 
 % P-CHANNEL IGFET DEPLETION TYPE
 \pgfdeclaretransistorwrapperaddbulk{pigfetd}{}{%
-	\pgf@circuit@trans@depletiontypetrue
-	\drawfetcore{pigfetd}
-  
-      % SOURCE CONNECTION
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}    
-      \pgfusepath{draw}
-      
-            
-      % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@up}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope{}
-      \fi
+    \pgf@circuit@trans@depletiontypetrue
+    \drawfetcore{pigfetd}
+
+    % SOURCE CONNECTION
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+
+    % SOLDER DOT at source-bulk connection
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@up}}
+            \pgfnode{circ}{center}{}{}{}
+        \endpgfscope{}
+    \fi
 }
 
 \pgfcircdeclaretransistor{njfet}{}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@up}}
-
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}		
-			\pgfusepath{draw}
-			
-			\pgfscope
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height}\pgf@circ@res@down}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-			\endpgfscope
-			
-			\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgfresetnontranslationattimefalse
-			\pgftransformlineattime{.6}{%
-				\pgfpoint{\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}%
-			}{%
-				\pgfpoint
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}%
-			}
-			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-			\endpgfscope
-	
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
-			\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@up}}
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height}\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgfresetnontranslationattimefalse
+        \pgftransformlineattime{.6}{%
+            \pgfpoint{\pgf@circ@res@left}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}%
+            }{%
+            \pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}%
+        }
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@down}}
+    \pgfusepath{draw}
 }
 
 
 \pgfcircdeclaretransistor{pjfet}{}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
-
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}		
-			\pgfusepath{draw}
-			
-			\pgfscope
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height}\pgf@circ@res@down}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-			\endpgfscope
-			
-			\pgfscope             
-			\pgfslopedattimetrue 
-			\pgfallowupsidedownattimetrue
-			\pgfresetnontranslationattimefalse
-			\pgftransformlineattime{.4}{%
-				\pgfpoint%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}%
-			}{%
-				\pgfpoint{\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}%
-			}
-			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-			\endpgfscope
-
-					
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
-			\pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfusepath{draw}
+
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height}\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgfresetnontranslationattimefalse
+        \pgftransformlineattime{.4}{%
+            \pgfpoint%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}%
+            }{%
+            \pgfpoint{\pgf@circ@res@left}%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}%
+        }
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
+
+
+    \pgfpathmoveto{\pgfpoint
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
+    \pgfusepath{draw}
 }
 
 
 \pgfdeclaretransistorwrapperaddbulk{isfet}{}{%
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
-      % DRAIN CONNECTION 
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@up}}
-      % DRAIN
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@up}}
-      \pgfusepath{draw}
-      
-      % GATE, DEPLETION TYPE
-      \pgfscope %% added
-      \pgfpathmoveto{\pgfpoint
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    % DRAIN CONNECTION
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@up}}
+    % DRAIN
+    \pgfpathlineto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@up}}
+    \pgfusepath{draw}
+
+    % GATE, DEPLETION TYPE
+    \pgfscope %% added
+        \pgfpathmoveto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base height}\pgf@circ@res@up}}
-      \pgfpathlineto{\pgfpoint
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base height}\pgf@circ@res@down}}
-      \pgfsetlinewidth{2\pgflinewidth} %% added
-      \pgfusepath{draw} %% added
-      \endpgfscope %% added
-      
-      % BULK
-      \pgfpathmoveto{\pgfpoint
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth} %% added
+        \pgfusepath{draw} %% added
+    \endpgfscope %% added
+
+    % BULK
+    \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
-        {\pgf@circ@res@up+\pgf@circ@res@down}}
-       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+.5\pgflinewidth}
-         {\pgf@circ@res@up+\pgf@circ@res@down}}
+    {\pgf@circ@res@up+\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right+.5\pgflinewidth}
+    {\pgf@circ@res@up+\pgf@circ@res@down}}
 
-      % SOURCE
-      \pgfpathmoveto{\pgfpoint
+    % SOURCE
+    \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}
-        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@down}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@down}}
-      % SOURCE CONNECTION
-      \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-      \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}    
-      \pgfusepath{draw}
-      
-      % GATE
-      %\pgfscope
-      %\pgfpathmoveto{\pgfpoint
-       % {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate width}\pgf@circ@res@left}
-       % {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@up}}
-      %\pgfpathlineto{\pgfpoint
-       % {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate width}\pgf@circ@res@left}
-       % {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@down}}
-      %\pgfsetlinewidth{2\pgflinewidth}
-      %\pgfusepath{draw}
-      %\endpgfscope
-      
-            
-      % SOLDER DOT at source-bulk connection
-      \ifpgf@circuit@fet@solderdot
-	      \pgfscope
-	        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-	          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
-	        \pgfnode{circ}{center}{}{}{}
-	      \endpgfscope{}
-      \fi
-      % ARROW
-      \pgfscope
-      \pgfslopedattimetrue 
-      \pgfallowupsidedownattimetrue
-      \pgfresetnontranslationattimefalse
-      \pgftransformlineattime{.6}{%
-        \pgfpoint
-          {\pgf@circ@res@right}%
-          {\pgf@circ@res@up+\pgf@circ@res@down}%
-      }{%
-        \pgfpoint%
-          {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}%
-          {\pgf@circ@res@up+\pgf@circ@res@down}%
-      }
-      \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
-      \endpgfscope
-      \pgfusepath{draw}
-      
-      % Wavy lines
-      	\pgfscope
-			\pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves y sep}\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfusepath{draw}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
+    {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/gate height}\pgf@circ@res@down}}
+    % SOURCE CONNECTION
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+    \pgfusepath{draw}
 
-			\pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{0cm}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfusepath{draw}
 
-			\pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves y sep}\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
-			\pgfusepath{draw}
-		\endpgfscope
+    % SOLDER DOT at source-bulk connection
+    \ifpgf@circuit@fet@solderdot
+        \pgfscope
+            \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
+            \pgfnode{circ}{center}{}{}{}
+        \endpgfscope{}
+    \fi
+    % ARROW
+    \pgfscope
+        \pgfslopedattimetrue
+        \pgfallowupsidedownattimetrue
+        \pgfresetnontranslationattimefalse
+        \pgftransformlineattime{.6}{%
+            \pgfpoint
+            {\pgf@circ@res@right}%
+            {\pgf@circ@res@up+\pgf@circ@res@down}%
+            }{%
+            \pgfpoint%
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/base width}\pgf@circ@res@left}%
+            {\pgf@circ@res@up+\pgf@circ@res@down}%
+        }
+        \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+    \endpgfscope
+    \pgfusepath{draw}
+
+    % Wavy lines
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves y sep}\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+        \pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{0cm}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfusepath{draw}
+
+        \pgfpathmoveto{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves x sep}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/waves y sep}\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathsine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfpathcosine{\pgfpoint{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave width}\pgf@circ@res@up}{-\pgfkeysvalueof{/tikz/circuitikz/tripoles/isfet/wave amp}\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 
 }
 
@@ -1976,45 +2129,49 @@
 		\northeast
 		\pgf@y=0cm
 	}
-}{\ctikzvalof{tripoles/thyristor/height 2}}{fullthyristor}{\ctikzvalof{tripoles/thyristor/height}}{\ctikzvalof{tripoles/thyristor/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-	\pgf@circ@res@other = \ctikzvalof{tripoles/thyristor/diode width left}\pgf@circ@res@left
-	\pgf@circ@res@step = \ctikzvalof{tripoles/thyristor/diode width right}\pgf@circ@res@right
-
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@other}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-				
-		\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}} 
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfusepath{draw,fill}
-		
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\ctikzvalof{tripoles/thyristor/diode height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@down}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	
-	\pgfusepath{draw}
-	
+}
+{\ctikzvalof{tripoles/thyristor/height 2}}
+{fullthyristor}{\ctikzvalof{tripoles/thyristor/height}}
+{\ctikzvalof{tripoles/thyristor/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@res@other = \ctikzvalof{tripoles/thyristor/diode width left}\pgf@circ@res@left
+    \pgf@circ@res@step = \ctikzvalof{tripoles/thyristor/diode width right}\pgf@circ@res@right
+
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@other}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+
+        \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+        \pgfusepath{draw,fill}
+
+        \pgfsetlinewidth{\pgfstartlinewidth}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+        \pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\ctikzvalof{tripoles/thyristor/diode height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@down}}
+
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
+
 }
 
 %% Empty thyristor
@@ -2034,45 +2191,58 @@
 		\northeast
 		\pgf@y=0cm
 	}
-}{\ctikzvalof{tripoles/thyristor/height 2}}{emptythyristor}{\ctikzvalof{tripoles/thyristor/height}}{\ctikzvalof{tripoles/thyristor/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-	\pgf@circ@res@other = \ctikzvalof{tripoles/thyristor/diode width left}\pgf@circ@res@left
-	\pgf@circ@res@step = \ctikzvalof{tripoles/thyristor/diode width right}\pgf@circ@res@right
-
-	\pgfscope
-		\pgftransformxshift{\pgf@circ@res@other}
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-				
-		\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}} 
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfusepath{draw}
-		
-		\pgfsetlinewidth{\pgfstartlinewidth}
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
-		\pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\ctikzvalof{tripoles/thyristor/diode height}\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\pgf@circ@res@up}}
-		\pgfusepath{draw}
-	\endpgfscope
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@down}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	
-	\pgfusepath{draw}
-	
+}
+{\ctikzvalof{tripoles/thyristor/height 2}}
+{emptythyristor}{\ctikzvalof{tripoles/thyristor/height}}
+{\ctikzvalof{tripoles/thyristor/width}}
+{
+
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@res@other = \ctikzvalof{tripoles/thyristor/diode width left}\pgf@circ@res@left
+    \pgf@circ@res@step = \ctikzvalof{tripoles/thyristor/diode width right}\pgf@circ@res@right
+
+    \pgfscope
+        \pgftransformxshift{\pgf@circ@res@other}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+
+        \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+        \pgfpathclose
+        \pgf@circ@draworfill
+        \pgfscope
+            % to allow filling, we need to draw explicitily the stroke here.
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \ifpgf@circuit@bipole@strokedsymbol
+                \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+                \pgfpathlineto{\pgfpoint{0pt}{0pt}}
+                \pgfusepath{draw}
+            \fi
+        \endpgfscope
+
+        \pgfsetlinewidth{\pgfstartlinewidth}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step-\pgf@circ@res@other}{0pt}}
+        \pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\ctikzvalof{tripoles/thyristor/diode height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{2*\pgf@circ@res@step-2*\pgf@circ@res@other}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{\pgf@circ@res@down}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-\pgf@circ@res@down}}
+
+    \pgfusepath{draw}
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
+
 }
 
 %% Empty triac
@@ -2092,42 +2262,47 @@
 		\northeast
 		\pgf@y=0cm
 	}
-}{\ctikzvalof{tripoles/triac/height}}{emptytriac}{\ctikzvalof{tripoles/triac/height}}{\ctikzvalof{tripoles/triac/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-	\pgf@circ@res@other = \ctikzvalof{tripoles/triac/diode width left}\pgf@circ@res@left
-	\pgf@circ@res@step = \ctikzvalof{tripoles/triac/diode width right}\pgf@circ@res@right
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	
-	\pgfusepath{draw}
-	
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}} % sqrt(1/2)
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	
-	\pgfusepath{draw}
-	
 }
+{\ctikzvalof{tripoles/triac/height}}
+{emptytriac}
+{\ctikzvalof{tripoles/triac/height}}
+{\ctikzvalof{tripoles/triac/width}}
+{
 
-%% Empty triac
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@res@other = \ctikzvalof{tripoles/triac/diode width left}\pgf@circ@res@left
+    \pgf@circ@res@step = \ctikzvalof{tripoles/triac/diode width right}\pgf@circ@res@right
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+
+    \pgf@circ@draworfill
+
+    \pgfsetlinewidth{\pgfstartlinewidth}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}} % sqrt(1/2)
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
+
+}
+
+%% Full triac
 
 \pgfcircdeclarebipole{
 	\anchor{gate}{
@@ -2144,46 +2319,44 @@
 		\northeast
 		\pgf@y=0cm
 	}
-}{\ctikzvalof{tripoles/triac/height}}{fulltriac}{\ctikzvalof{tripoles/triac/height}}{\ctikzvalof{tripoles/triac/width}}{
-
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-
-	\pgf@circ@res@other = \ctikzvalof{tripoles/triac/diode width left}\pgf@circ@res@left
-	\pgf@circ@res@step = \ctikzvalof{tripoles/triac/diode width right}\pgf@circ@res@right
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
-	
-	\pgfusepath{draw,fill}
-	
-	\pgfsetlinewidth{\pgfstartlinewidth}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}} % sqrt(1/2)
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	
-	\pgfusepath{draw}
-	
 }
+{\ctikzvalof{tripoles/triac/height}}
+{fulltriac}
+{\ctikzvalof{tripoles/triac/height}}
+{\ctikzvalof{tripoles/triac/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+
+    \pgf@circ@res@other = \ctikzvalof{tripoles/triac/diode width left}\pgf@circ@res@left
+    \pgf@circ@res@step = \ctikzvalof{tripoles/triac/diode width right}\pgf@circ@res@right
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@step}{0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{0.95\pgf@circ@res@other}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@step}{1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}}
 
+    \pgfusepath{draw,fill}
 
+    \pgfsetlinewidth{\pgfstartlinewidth}
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{-0.707*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{-1.414*(\pgf@circ@res@other-\pgf@circ@res@step)}} % sqrt(1/2)
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}} % sqrt(1/2)
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+
+    \pgfusepath{draw}
 
+}
 
 \pgfcircdeclarebipole{
 	\anchor{out 1}{
@@ -2194,407 +2367,884 @@
 		\northeast
 		\pgf@y=.8\pgf@y
 	}
-}{\ctikzvalof{tripoles/toggleswitch/height 2}}{toggleswitch}{\ctikzvalof{tripoles/toggleswitch/height}}{\ctikzvalof{tripoles/toggleswitch/width}}{
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-	\pgfpathlineto{\pgfpoint{.3\pgf@circ@res@left}{0pt}}
-	\pgfusepath{draw}
-	\pgfscope
-	\pgfpathmoveto{\pgfpoint{.3\pgf@circ@res@left}{0pt}}
-	\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{.5\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	\endpgfscope
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{0}}
-	
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{.8\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{.8\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{.15\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	
-	
-	\pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@left}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	
-	\pgfsetdash{{.08\pgf@circ@res@up}{.04\pgf@circ@res@up}{.7\pgf@circ@res@up}{.04\pgf@circ@res@up}{.8\pgf@circ@res@up}}{0cm}
-	\pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0}{.8\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{.2\pgf@circ@res@left}{.6\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0}{.4\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0}{.2\pgf@circ@res@up}}
-	\pgfusepath{draw}
-	\pgfsetdash{}{0cm}
 }
+{\ctikzvalof{tripoles/toggleswitch/height 2}}
+{toggleswitch}
+{\ctikzvalof{tripoles/toggleswitch/height}}
+{\ctikzvalof{tripoles/toggleswitch/width}}
+{
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+    \pgfpathlineto{\pgfpoint{.3\pgf@circ@res@left}{0pt}}
+    \pgfusepath{draw}
+    \pgfscope
+        \pgfpathmoveto{\pgfpoint{.3\pgf@circ@res@left}{0pt}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{.5\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+    \pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{0}}
 
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.5\pgf@circ@res@right}{.15\pgf@circ@res@up}}
+    \pgfusepath{draw}
 
 
+    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@left}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@right}{\pgf@circ@res@up}}
+    \pgfusepath{draw}
 
+    \pgfsetdash{{.08\pgf@circ@res@up}{.04\pgf@circ@res@up}{.7\pgf@circ@res@up}{.04\pgf@circ@res@up}{.8\pgf@circ@res@up}}{0cm}
+    \pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0}{.8\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{.2\pgf@circ@res@left}{.6\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0}{.4\pgf@circ@res@up}}
+    \pgfpathlineto{\pgfpoint{0}{.2\pgf@circ@res@up}}
+    \pgfusepath{draw}
+    \pgfsetdash{}{0cm}
+}
 
-
-
+%% operational and instrumentation amplifiers
 
 \pgfdeclareshape{op amp}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	  }
-	  \anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{leftedge}
-	  {\left
-		  \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }	  
-	  \anchor{-}{
-		\inOne
-	  }
-	  \anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\up{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-	    \pgfpointlineattime{
-			\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/up pos}}{
-			\pgfpoint{
-				\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-				{\pgf@circ@res@up}}
-			{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	  }
-	  \anchor{up}{
-		\up
-	  }
-	  \anchor{down}{
-		\up
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  	\anchor{west}{
-		  	\left
-    	  }
-		  \anchor{east}{
-		  	\left
-		  	\pgf@x=-\pgf@x
-		  }  
-	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-			
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $-$}
-	
-
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $+$}
-		
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	\pgfsetrectcap
-	\pgfusepath{draw}
-
-						
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
-		\pgfpathclose
-		\pgfusepath{draw}
-	\endpgfscope
-		
-		
-	  
-	  }
-	}
+{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {\left
+        \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    }
+    \savedanchor\inOneFixed{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@step}{0pt}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+        \pgfsetrectcap
+        \pgfusepath{draw}
+
+
+    }
+}
 
 %op amp shape as in european standard en 60617
 \pgfdeclareshape{en amp}
 {
-	\anchor{center}{\pgfpointorigin}
-	\savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\savedanchor\left{%
-	  	\pgf@y=0pt
-	}
-	\anchor{leftedge}
-	{
-		\left
-	 	\pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/port width}\pgf@x
-	}
-	\savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	}	  
-	\anchor{-}{
-		\inOne
-	}
-	\anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	}
-	\anchor{up}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{down}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{west}{
-		\left
-	}
-	\anchor{east}{
-	  	\left
-		\pgf@x=-\pgf@x
-	}
-	\backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@up}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/font} $-$}
-	
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@down}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/font} $+$}
-		
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	\pgfsetrectcap
-	\pgfusepath{draw}
-				
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgfpathmoveto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}{\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@left}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/american nand port/port width}\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfpathclose
-		\pgfusepath{draw}
-	\endpgfscope
-
-	\pgftext[base,y=-3ex,at=\pgfpoint{.3\pgf@circ@res@left}{\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/font2} $\triangleright$}
-	\pgftext[base,y=-3ex,at=\pgfpoint{.3\pgf@circ@res@right}{\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/en amp/font2} $\infty$}
-	  }
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\ctikzvalof{tripoles/en amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\ctikzvalof{tripoles/en amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {
+        \left
+        \pgf@x = \ctikzvalof{tripoles/en amp/port width}\pgf@x
+    }
+    \savedanchor\inOneFixed{%
+        \pgf@y=\ctikzvalof{tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\ctikzvalof{tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\ctikzvalof{tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\ctikzvalof{tripoles/en amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\ctikzvalof{tripoles/en amp/input height}\pgf@y
+        \pgf@x=-\ctikzvalof{tripoles/en amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \anchor{up}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{down}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgfscope
+            \pgfsetlinewidth{\ctikzvalof{tripoles/thickness}\pgflinewidth}
+            \pgfpathmoveto{\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@right}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}
+            {\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}}
+        \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@up}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}
+            {\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\ctikzvalof{tripoles/en amp/port width}\pgf@circ@res@left}{\ctikzvalof{tripoles/en amp/input height}\pgf@circ@res@down}]{\ctikzvalof{tripoles/en amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+        \pgfsetrectcap
+        \pgfusepath{draw}
+
+
+        \pgftext[top, y=-.5ex, at=\pgfpoint{0pt}{\pgf@circ@res@up}]{\hbox{\ctikzvalof{tripoles/en amp/font2}\ctikzvalof{tripoles/en amp/text}}}
+        % \pgftext[top, y=-.5ex, at=\pgfpoint{0pt}{\pgf@circ@res@up}]{\ctikzvalof{tripoles/en amp/font2}$\mathstrut{\triangleright}\,\mathrm{A}$}
+    }
 }
 
 %%Transkonduktanzverstärker
 \pgfdeclareshape{gm amp}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{south}{
-		\northwest
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{north}{
-		\northwest
-	  }
-	  \savedanchor\left{%
-	  	\pgf@y=0pt
-	  }
-	  \anchor{leftedge}
-	  {\left
-  	  	\pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
-	  }
-	  \savedanchor\inOne{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-	  }	  
-	  \anchor{-}{
-		\inOne
-	  }
-	  \anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\up{%
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
-		\pgf@y=.5\pgf@y
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
-		\pgf@x=.5\pgf@x
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-	    \pgfpointlineattime{
-			\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/up pos}}{
-			\pgfpoint{
-				\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
-				{\pgf@circ@res@up}}
-			{\pgfpoint{.7\pgf@circ@res@right}{0pt}}
-	  }
-	  \anchor{up}{
-		\up
-	  }
-	  \anchor{down}{
-		\up
-		\pgf@y=-\pgf@y
-	  }
-	  \anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	  }
-	  	\anchor{west}{
-		  	\left
-    	  }
-		  \anchor{east}{
-		  	\left
-		  	\pgf@x=-\pgf@x
-		  }  
-	  
-	  \backgroundpath{			
-			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-						
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x
-			\pgf@circ@res@left = \pgf@x
-			
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $-$}
-	
-
-	\pgfpathmoveto{\pgfpoint
-		{\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
-		{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}}
-	\pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $+$}
-		
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
-	\pgfpathlineto{\pgfpoint{.3\pgf@circ@res@right}{0pt}} %
-		\pgfsetrectcap
-	\pgfusepath{draw}
-
-	\pgfscope
-		\pgfsetlinewidth{2\pgflinewidth}
-		\pgftransformxshift{.7\pgf@circ@res@left}
-		\pgf@circ@res@step=\pgf@circ@res@right
-		\advance\pgf@circ@res@step by -\pgf@circ@res@left
-		\pgf@circ@res@step=.7\pgf@circ@res@step
-		%Umrandung:
-		\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}} %geändert startpunkt neu am ausgangsstrich
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}%vom Ausgang nach oben
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}} %neu ecke links oben nach rechts oben
-		\pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}} %bei deneigängen runter 
-		\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}%ecke links unten nach rechts unten
-		\pgfpathclose
-		\pgfusepath{draw}
-	\endpgfscope
-  
-	  }
-	}	
+{
+    \anchor{center}{\pgfpointorigin}
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {\left
+        \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    }
+    \savedanchor\inOneFixed{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{0pt}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+    \anchor{text}{\northwest
+        \pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    \pgfpoint{-.5\wd\pgfnodeparttextbox+.25\pgf@x}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+            %Umrandung:
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0}} %geändert startpunkt neu am ausgangsstrich
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@up}}%vom Ausgang nach oben
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}} %neu ecke links oben nach rechts oben
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}} %bei deneigängen runter
+            \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{.5\pgf@circ@res@down}}%ecke links unten nach rechts unten
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/gm amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.3\pgf@circ@res@right}{0pt}} %
+        \pgfsetrectcap
+        \pgfusepath{draw}
+
+    }
+}
 
+%% instrumentation amplifier
 
+\pgfdeclareshape{inst amp}
+{
+    % when tikz calls the anchor it wants the relative position in the lengths
+    % \pgf@x  \pgf@y
+    % \pgfpoint* functions set that variables
+    % anchors are visible outside and run on use
+    \anchor{center}{\pgfpointorigin}
+    % savedanchors are internals and run on node creation (not use)
+    % bounding-box top left
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{nw}{
+        \northwest
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {\left
+        \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    }
+    \savedanchor\inOneFixed{%
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+          \pgf@y=.5\pgf@y
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+          \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+          \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    % reference voltage input anchors.
+    \savedanchor\refv{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/refv pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+    }
+    % we need both because they are normally drawn under the amp, and if you
+    % mirror it vertically you need them
+    \anchor{refv up}{
+        \refv
+    }
+    \anchor{refv down}{
+        \refv
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    % let's start drawing the component
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        %
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        % main component, normally in thicker lines
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+            %first point (near output)
+            \pgfpathmoveto{\pgfpoint{1.4\pgf@circ@res@right}{0}}
+            %from the exit to the top (short side)... (note that the .6 must be copied in \up and \refv anchors
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.6\pgf@circ@res@up}}
+            % and then to the input "front up", "down", to the output short side "down"
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.6\pgf@circ@res@down}}
+            % ...and close
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+        % input terminal -
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@up}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@up}}
+        %
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+        % input terminal +
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@down}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@down}}
+    \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+        % output lead
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}} %
+        %
+        \pgfsetrectcap
+        \pgfusepath{draw}
+    }
+}
 
+% instrumentation amplifier, with terminals for gain resistance between inputs
+\pgfdeclareshape{inst amp ra}
+{
+    \anchor{center}{\pgfpointorigin}
+    % bounding-box top left
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{nw}{
+        \northwest
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@y=-\pgf@y\pgf@x=0pt\relax
+    }
+    \anchor{north}{
+        \northwest\pgf@x=0pt\relax
+    }
+    \savedanchor\left{%
+        \pgf@y=0pt
+    }
+    \anchor{leftedge}
+    {\left
+        \pgf@x = \pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/port width}\pgf@x
+    }
+    % inputs (+-)
+    \savedanchor\inOneFixed{%
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+          \pgf@y=.5\pgf@y
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+          \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+          \pgf@x=.5\pgf@x
+    }
+    \anchor{in up}{
+        \inOneFixed
+    }
+    \anchor{in down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\inOne{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{-}{
+        \inOne
+    }
+    \anchor{+}{
+        \inOne
+        \pgf@y=-\pgf@y
+    }
+    % R ampli anchors. They are by default at 20% more than R-length distance
+    % you can change that with the `ra pos` key (use 0.5 for one-R).
+    \savedanchor\raOneFixed{%
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@circ@Rlen
+          \pgf@y=.5\pgf@y
+          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
+          \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@circ@Rlen
+          \pgf@x=.5\pgf@x
+    }
+    \anchor{ra up}{
+        \inOneFixed
+    }
+    \anchor{ra down}{
+        \inOneFixed
+        \pgf@y=-\pgf@y
+    }
+    \savedanchor\raOne{%
+        \pgf@y=\pgf@circ@Rlen
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/ra pos}\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \ifpgf@circuit@oa@iplusup\pgf@y=-\pgf@y\fi
+    }
+    \anchor{ra-}{
+        \raOne
+    }
+    \anchor{ra+}{
+        \raOne
+        \pgf@y=-\pgf@y
+    }
+    % power supplies
+    \savedanchor\up{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/up pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.4\pgf@circ@res@up}}
+    }
+    \anchor{up}{
+        \up
+    }
+    \anchor{down}{
+        \up
+        \pgf@y=-\pgf@y
+    }
+    % reference voltage input anchors.
+    \savedanchor\refv{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/height}\pgf@circ@Rlen
+        \pgf@y=0.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/width}\pgf@circ@Rlen
+        \pgf@x=0.5\pgf@x
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfpointlineattime{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/refv pos}}{
+            \pgfpoint{
+            \pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {\pgf@circ@res@up}}
+        {\pgfpoint{.7\pgf@circ@res@right}{.4\pgf@circ@res@up}}
+    }
+    % we need both because they are normally drawn under the amp, and if you
+    % mirror it vertically you need them
+    \anchor{refv up}{
+        \refv
+    }
+    \anchor{refv down}{
+        \refv
+        \pgf@y=-\pgf@y
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \left
+    }
+    \anchor{east}{
+        \left
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+
+    \anchor{text}{\pgfpoint{-.5\wd\pgfnodeparttextbox}{\dimexpr.5\dp\pgfnodeparttextbox-.5\ht\pgfnodeparttextbox}}
+
+    % drawing of the component
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        % main component, normally in thicker lines
+        \pgfscope
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgftransformxshift{.7\pgf@circ@res@left}
+            \pgf@circ@res@step=\pgf@circ@res@right
+            \advance\pgf@circ@res@step by -\pgf@circ@res@left
+            \pgf@circ@res@step=.7\pgf@circ@res@step
+            %primer punto: la linea de salida (lado componente)
+            \pgfpathmoveto{\pgfpoint{1.4\pgf@circ@res@right}{0}}
+            %from the exit to the top (short side)... (note that the .4 must be copied in \up anchor
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.4\pgf@circ@res@up}}
+            % and then to the input "front up", "down", to the output short side "down"
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0pt}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{1.4\pgf@circ@res@right}{.4\pgf@circ@res@down}}
+            % ...and close
+            \pgfpathclose
+            \pgf@circ@draworfill
+        \endpgfscope
+
+        % ra terminal -
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/ra pos}\pgf@circ@Rlen}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/ra pos}\pgf@circ@Rlen}}
+        % ra terminal +
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/ra pos}\pgf@circ@Rlen}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {-\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/ra pos}\pgf@circ@Rlen}}
+        % input terminal -
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@up}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@up}}
+        %
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup$+$\else$-$\fi}
+
+        % input terminal +
+        \pgfpathmoveto{\pgfpoint
+            {\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@down}}
+        %
+        \pgfpathlineto{\pgfpoint
+            {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}
+        {\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@down}}
+        \pgftext[left, at=\pgfpoint{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/port width}\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/input height}\pgf@circ@res@down}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/inst amp ra/font} \ifpgf@circuit@oa@iplusup$-$\else$+$\fi}
+        % output lead
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}}
+        \pgfpathlineto{\pgfpoint{.7\pgf@circ@res@right}{0pt}} %
+        %
+        \pgfsetrectcap
+        \pgfusepath{draw}
+    }
+}
 %% Potentiometer
 \pgfcircdeclarebipole{
 	\anchor{wiper}{
@@ -2604,441 +3254,454 @@
 	\anchor{W}{
 		\northeast
 		\pgfpoint{0pt}{\pgf@y}
-	}	
-}{\ctikzvalof{bipoles/potentiometer/height 2}}{potentiometer}{\ctikzvalof{bipoles/potentiometer/height}}{\ctikzvalof{bipoles/potentiometer/width}}{
-\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-\pgftransformationadjustments
-\pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
-\divide \pgf@circ@res@step by 12
-
-\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
-
-\pgf@circ@res@other = \pgf@circ@res@left
-\advance\pgf@circ@res@other by \pgf@circ@res@step 
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by 2\pgf@circ@res@step 
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by 2\pgf@circ@res@step
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
-\advance\pgf@circ@res@other by \pgf@circ@res@step
-\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
-\pgfsetbeveljoin
-\pgfusepath{draw}
-
-\pgfscope
-	%\pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfsetarrowsend{latex'}
-	\pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
-	\pgfusepath{draw}
-\endpgfscope
+	}
+}
+{\ctikzvalof{bipoles/potentiometer/height 2}}
+{potentiometer}{\ctikzvalof{bipoles/potentiometer/height}}
+{\ctikzvalof{bipoles/potentiometer/width}}
+{
+    \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+    \pgftransformationadjustments
+    \pgfmathsetlength{\pgf@circ@res@step}{\ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen+\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}
+    \divide \pgf@circ@res@step by 12
+
+    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*0.5*\pgflinewidth}{\pgf@circ@res@zero}}
+
+    \pgf@circ@res@other = \pgf@circ@res@left
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{-\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by 2\pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@down}}
+    \advance\pgf@circ@res@other by \pgf@circ@res@step
+    \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{\pgf@circ@res@zero}}
+    \pgfsetbeveljoin
+    \pgfusepath{draw}
+
+    \pgfscope
+        %\pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 
 
 
-%% Generic tunable 
+%% Generic tunable
 
 \pgfcircdeclarebipole{
 	\anchor{wiper}{
 		\northeast
 		\pgfpoint{0pt}{\pgf@y}
 	}
-}{\ctikzvalof{bipoles/generic potentiometer/height 2}}{genericpotentiometer}{\ctikzvalof{bipoles/generic potentiometer/height}}{\ctikzvalof{bipoles/generic potentiometer/width}}{
+}
+{\ctikzvalof{bipoles/generic potentiometer/height 2}}
+{genericpotentiometer}
+{\ctikzvalof{bipoles/generic potentiometer/height}}
+{\ctikzvalof{bipoles/generic potentiometer/width}}
+{
 
-		\pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
-		\divide \pgf@circ@res@step by 14
+    \pgf@circ@res@step = \ctikzvalof{bipoles/resistor/width}\pgf@circ@Rlen
+    \divide \pgf@circ@res@step by 14
 
-		\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-		\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-					
-		\pgfusepath{draw} 
-		
-		\pgfscope
-		%\pgfsetlinewidth{\pgfstartlinewidth}
-		\pgfsetarrowsend{latex'}
-		\pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
-		\pgfusepath{draw}
-		\endpgfscope
+    \pgfscope
+        \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{-\pgf@circ@res@down}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+        \pgf@circ@draworfill
+    \endpgfscope
+    \pgfscope
+        %\pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfsetarrowsend{latexslim}
+        \pgfpathmoveto{\pgfpoint{0pt}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0pt}{-\pgf@circ@res@down}}
+        \pgfusepath{draw}
+    \endpgfscope
 }
 
 
 \pgfdeclareshape{mixer}
 {
-	\savedanchor\northwest{
-		\ifpgf@circuit@boxed
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-		\else	
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-		\fi
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{3}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{4}{
-		\northwest
-		\pgf@y=\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{in 1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{in1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	}	  
-	\anchor{in 2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{in2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{center}{
-		\pgf@y=0pt
-		\pgf@x=0pt
-	}
-	\anchor{east}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x  
-	}
-	\anchor{west}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	}
-	\anchor{north west}{
-		\northwest
-	}
-	\anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	}
-	\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-		\pgf@circ@res@step=\ctikzvalof{tripoles/mixer/width}\pgf@circ@Rlen
-			
-		\pgfscope
-			\pgfstartlinewidth=\pgflinewidth
-			
-			% draw outer box
-			\ifpgf@circuit@boxed
-				\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-			\fi
-			
-			% draw outer circle
-			\ifpgf@circuit@boxed
-				\pgf@circ@res@step=.7\pgf@circ@res@step
-				\pgfsetdash{}{0pt}	% draw solid circle if boxed
-			\else
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\fi
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
-			% draw inner stuff
-			\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathmoveto{\pgfpointpolar{135}{0.5\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpointpolar{-45}{0.5\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathmoveto{\pgfpointpolar{45}{0.5\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpointpolar{-135}{0.5\pgf@circ@res@step}}
-			\pgfusepath{draw}
-			
-		\endpgfscope
-	}
+    \savedanchor\northwest{
+        \ifpgf@circuit@boxed
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        \else
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        \fi
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{left}{%
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{3}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{4}{
+        \northwest
+        \pgf@y=\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{in 1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in 2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{in2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{center}{
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \pgf@circ@res@step=\ctikzvalof{tripoles/mixer/width}\pgf@circ@Rlen
+
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+
+            % draw outer box
+            \ifpgf@circuit@boxed
+                \pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+            \fi
+
+            % draw outer circle
+            \ifpgf@circuit@boxed
+                \pgf@circ@res@step=.7\pgf@circ@res@step
+                \pgfsetdash{}{0pt}	% draw solid circle if boxed
+            \else
+                \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \fi
+            \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+            \pgf@circ@draworfill
+
+            % draw inner stuff
+            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathmoveto{\pgfpointpolar{135}{0.5\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpointpolar{-45}{0.5\pgf@circ@res@step}}
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathmoveto{\pgfpointpolar{45}{0.5\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpointpolar{-135}{0.5\pgf@circ@res@step}}
+            \pgfusepath{draw}
+
+        \endpgfscope
+    }
 }
 
 \pgfdeclareshape{adder}
 {
-	\savedanchor\northwest{
-		\ifpgf@circuit@boxed
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-		\else	
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-		\fi
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{3}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{4}{
-		\northwest
-		\pgf@y=\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{in 1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{in1}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{in}{
-		\northwest
-		\pgf@y=0pt
-	}	  
-	\anchor{in 2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{in2}{
-		\northwest
-		\pgf@y=-\pgf@y
-		\pgf@x=0pt
-	}
-	\anchor{out}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{center}{
-		\pgf@y=0pt
-		\pgf@x=0pt
-	}
-	\anchor{east}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x  
-	}
-	\anchor{west}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{south west}{
-		\northwest
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north east}{
-		\northwest
-		\pgf@x=-\pgf@x
-	}
-	\anchor{north west}{
-		\northwest
-	}
-	\anchor{south east}{
-		\northwest
-		\pgf@x=-\pgf@x
-		\pgf@y=-\pgf@y
-	}
-	\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-		\pgf@circ@res@step=\ctikzvalof{tripoles/adder/width}\pgf@circ@Rlen
-			
-		\pgfscope
-			\pgfstartlinewidth=\pgflinewidth
-			
-			% draw outer box
-			\ifpgf@circuit@boxed
-				\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-			\fi
-			
-			% draw outer circle
-			\ifpgf@circuit@boxed
-				\pgf@circ@res@step=.7\pgf@circ@res@step{}
-				\pgfsetdash{}{0pt}	% draw solid circle if boxed
-			\else
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\fi
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
-			% draw inner stuff
-			\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathmoveto{\pgfpointpolar{0}{0.3\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpointpolar{180}{0.3\pgf@circ@res@step}}
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfpathmoveto{\pgfpointpolar{90}{0.3\pgf@circ@res@step}}
-			\pgfpathlineto{\pgfpointpolar{270}{0.3\pgf@circ@res@step}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-			
-		\endpgfscope				  
-	}
+    \savedanchor\northwest{
+        \ifpgf@circuit@boxed
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        \else
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@circ@Rlen
+            \pgf@x=.5\pgf@x
+        \fi
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{left}{%
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{3}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{4}{
+        \northwest
+        \pgf@y=\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{in 1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in1}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{in 2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{in2}{
+        \northwest
+        \pgf@y=-\pgf@y
+        \pgf@x=0pt
+    }
+    \anchor{out}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{center}{
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \pgf@circ@res@step=\ctikzvalof{tripoles/adder/width}\pgf@circ@Rlen
+
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+
+            % draw outer box
+            \ifpgf@circuit@boxed
+                \pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+            \fi
+
+            % draw outer circle
+            \ifpgf@circuit@boxed
+                \pgf@circ@res@step=.7\pgf@circ@res@step{}
+                \pgfsetdash{}{0pt}	% draw solid circle if boxed
+            \else
+                \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \fi
+            \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+            \pgf@circ@draworfill
+
+            % draw inner stuff
+            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            \pgfsetlinewidth{\pgfstartlinewidth}
+
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathmoveto{\pgfpointpolar{0}{0.3\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpointpolar{180}{0.3\pgf@circ@res@step}}
+            \pgfpathmoveto{\pgfpointorigin}
+            \pgfpathmoveto{\pgfpointpolar{90}{0.3\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpointpolar{270}{0.3\pgf@circ@res@step}}
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/tripoles/thickness}\pgflinewidth}
+            \pgfusepath{draw}
+
+        \endpgfscope
+    }
 }
 
 \pgfdeclareshape{oscillator}
 {
-	\savedanchor\northwest{
-		\ifpgf@circuit@boxed
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
-		\else	
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@circ@Rlen
-		\fi
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=.5\pgf@x
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@x=.5\pgf@x
-		\pgf@y=-\pgf@y
-	}
-	\anchor{east}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=0pt
-	}
-	\anchor{west}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{text}{
-		\pgf@x=-2\pgf@x
-		\advance \pgf@x by -.5\wd\pgfnodeparttextbox
-		\advance \pgf@y by -1.5\ht\pgfnodeparttextbox
-	}
-	\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-			
-		\pgf@circ@res@step=\ctikzvalof{tripoles/oscillator/width}\pgf@circ@Rlen{}
-			
-		\pgfscope
-			\pgfstartlinewidth=\pgflinewidth
-			
-			\pgftransformxshift{-0.5\pgf@circ@res@step} % The oscillator is shifted to the left, so a connection comes out of the anchor "east"
-			
-			% draw outer box
-			\ifpgf@circuit@boxed{}
-				\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-			\fi
-			
-			% draw outer circle
-			\ifpgf@circuit@boxed
-				\pgf@circ@res@step=.7\pgf@circ@res@step{}
-				\pgfsetdash{}{0pt}	% draw solid circle if boxed
-			\else
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\fi
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
-			% draw inner sine waves
-			\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-			\pgfsetlinewidth{\pgfstartlinewidth}
-			\pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
-			\pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{0\pgf@circ@res@step}}
-			\pgfpathsine{\pgfpoint{.15\pgf@circ@res@step}{.15\pgf@circ@res@step}}
-			\pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
-			\pgfpathsine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
-			\pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{.15\pgf@circ@res@step}}
-		
-			\pgfusepath{draw}
-			
-		\endpgfscope				  
-	}
+    \savedanchor\northwest{
+        \ifpgf@circuit@boxed
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
+        \else
+            \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@circ@Rlen
+            \pgf@y=.5\pgf@y
+            \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@circ@Rlen
+        \fi
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=.5\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y}
+    \anchor{north east}{ \northwest \pgf@x=0pt\relax}
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=0pt \pgf@y=-\pgf@y }
+    \anchor{text}{
+        \pgf@x=-2\pgf@x
+        \advance \pgf@x by -.5\wd\pgfnodeparttextbox
+        \advance \pgf@y by -1.5\ht\pgfnodeparttextbox
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \pgf@circ@res@step=\ctikzvalof{tripoles/oscillator/width}\pgf@circ@Rlen{}
+
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+
+            \pgftransformxshift{-0.5\pgf@circ@res@step} % The oscillator is shifted to the left, so a connection comes out of the anchor "east"
+
+            % draw outer box
+            \ifpgf@circuit@boxed{}
+                \pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+            \fi
+
+            % draw outer circle
+            \ifpgf@circuit@boxed
+                \pgf@circ@res@step=.7\pgf@circ@res@step{}
+                \pgfsetdash{}{0pt}	% draw solid circle if boxed
+            \else
+                \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \fi
+            \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+            \pgf@circ@draworfill
+
+            % draw inner sine waves
+            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            \pgfsetlinewidth{\pgfstartlinewidth}
+            \pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
+            \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{0\pgf@circ@res@step}}
+            \pgfpathsine{\pgfpoint{.15\pgf@circ@res@step}{.15\pgf@circ@res@step}}
+            \pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
+            \pgfpathsine{\pgfpoint{.15\pgf@circ@res@step}{-.15\pgf@circ@res@step}}
+            \pgfpathcosine{\pgfpoint{.15\pgf@circ@res@step}{.15\pgf@circ@res@step}}
+
+            \pgfusepath{draw}
+
+        \endpgfscope
+    }
 }
 
 \pgfdeclareshape{circulator}
@@ -3049,7 +3712,7 @@
 			\pgf@y=.5\pgf@y
 			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@circ@Rlen
 			\pgf@x=.5\pgf@x
-		\else	
+		\else
 			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@circ@Rlen
 			\pgf@y=.5\pgf@y
 			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@circ@Rlen
@@ -3080,7 +3743,7 @@
 	\anchor{east}{
 		\northwest
 		\pgf@y=0pt
-		\pgf@x=-\pgf@x  
+		\pgf@x=-\pgf@x
 	}
 	\anchor{west}{
 		\northwest
@@ -3112,18 +3775,18 @@
 		\pgf@y=-\pgf@y
 	}
 	\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
+		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
 		\pgf@circ@res@step=\ctikzvalof{tripoles/circulator/width}\pgf@circ@Rlen
-			
+
 		\pgfscope
 			\pgfstartlinewidth=\pgflinewidth
-			
+
 			% draw outer box
 			\ifpgf@circuit@boxed
 				\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
 			\fi
-			
+
 			% draw outer circle
 			\ifpgf@circuit@boxed{}
 				\pgf@circ@res@step=.7\pgf@circ@res@step{}
@@ -3132,392 +3795,387 @@
 				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
 			\fi
 			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
+                        \pgf@circ@draworfill
+
 			% inner arrow
 			\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
 			\pgfsetlinewidth{\pgfstartlinewidth}
-			
+
 			\pgfsetarrowsend{latex}
 			\pgfpathmoveto{\pgfpoint{-0.25\pgf@circ@res@step}{0}}
 			\pgfpatharc{180}{-90} {0.25\pgf@circ@res@step}
 			\pgfpathlineto{\pgfpoint{-5pt}{-0.2\pgf@circ@res@step}}
 			\pgfusepath{draw}
-			
-		\endpgfscope				  
+
+		\endpgfscope
 	}
 }
 
 
 % Wilkinson divider
 \pgfdeclareshape{wilkinson}{
-		\anchor{center}{
-			\northwest
-			\pgf@x=0pt
-			\pgf@y=0pt
-		}
-		\savedanchor\northwest{%
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/wilkinson/height}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x= \pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/wilkinson/width}\pgf@x
-			}
-		\anchor{north}{
-			\northwest
-			\pgf@x=0pt
-		}
-		\anchor{south}{
-			\northwest
-			\pgf@x=0pt
-			\pgf@y=-\pgf@y
-		}
-		\anchor{west}{
-			\northwest
-			\pgf@y=0pt
-		}
-		\anchor{east}{
-			\northwest
-			\pgf@y=0pt
-			\pgf@x=-\pgf@x
-		}
-		\anchor{south west}{
-			\northwest
-			\pgf@y=-\pgf@y
-		}
-		\anchor{north east}{
-			\northwest
-			\pgf@x=-\pgf@x
-		}
-			\anchor{north west}{
-			\northwest
-		}
-		\anchor{south east}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=-\pgf@y
-		}
-		\anchor{in}{
-			\northwest
-			\pgf@y=0pt
-		}
-		\anchor{out1}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=-0.5\pgf@y
-		}
-		\anchor{out2}{
-			\northwest
-			\pgf@x=-\pgf@x
-			\pgf@y=0.5\pgf@y
-		}
-		\anchor{text}{
-			\northwest
-			\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
-			\pgf@x=-.5\wd\pgfnodeparttextbox
-		}
-		\backgroundpath{			
-				\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
-			
-				\northwest
-				\pgf@circ@res@up = \pgf@y 
-				\pgf@circ@res@down = -\pgf@y
-				\pgf@circ@res@right = -\pgf@x
-				\pgf@circ@res@left = \pgf@x
-			
-				\pgfstartlinewidth=\pgflinewidth
-
-				% draw outer box
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-				\pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
-				\pgfusepath{draw}
-				
-				% draw inner stuff
-				\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-				\pgfsetarrows{-} %never draw arrows
-				\pgfsetlinewidth{\pgfstartlinewidth}
-				\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
-				\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-				\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}				
-				
-				\pgfusepath{draw}
-				
-				\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-				% draw inner resisitor - european or american style is recognised
-				{
-					\pgftransformshift{\pgfpoint{0.5\pgf@circ@res@right}{0pt}}
-					\pgftransformrotate{90}
-					
-					% calculate size of resistor
-					\ifpgf@circuit@europeanresistor
-						\pgfmathparse{\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/generic/width} / 2}
-						\pgftransformscale{\pgfmathresult}
-						\pgfnode{genericshape}{center}{}{pgf@generic}{\pgfusepath{fill}}
-					\else
-						\pgfmathparse{\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/resistor/width} / 2}
-						\pgftransformscale{\pgfmathresult}
-						\pgfnode{resistorshape}{center}{}{pgf@resistor}{\pgfusepath{fill}}
-					\fi
-				}
-				
-				\pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
-				
-				\pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
-				\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-				\pgfusepath{draw}
-
-		}
+    \anchor{center}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=0pt
+    }
+    \savedanchor\northwest{%
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/wilkinson/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x= \pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/wilkinson/width}\pgf@x
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{south west}{
+        \northwest
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north east}{
+        \northwest
+        \pgf@x=-\pgf@x
+    }
+    \anchor{north west}{
+        \northwest
+    }
+    \anchor{south east}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-\pgf@y
+    }
+    \anchor{in}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{out1}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=-0.5\pgf@y
+    }
+    \anchor{out2}{
+        \northwest
+        \pgf@x=-\pgf@x
+        \pgf@y=0.5\pgf@y
+    }
+    \anchor{text}{
+        \northwest
+        \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
+        \pgf@x=-.5\wd\pgfnodeparttextbox
+    }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+
+        \pgfstartlinewidth=\pgflinewidth
+
+        % draw outer box
+        \pgf@circ@twoportbox
+
+        % draw inner stuff
+        \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+        \pgfsetarrows{-} %never draw arrows
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+
+        \pgfusepath{draw}
+
+        \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+        % draw inner resisitor - european or american style is recognised
+        {
+            \pgftransformshift{\pgfpoint{0.5\pgf@circ@res@right}{0pt}}
+            \pgftransformrotate{90}
+
+            % calculate size of resistor
+            \ifpgf@circuit@europeanresistor
+                \pgfmathparse{\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/generic/width} / 2}
+                \pgftransformscale{\pgfmathresult}
+                \pgfnode{genericshape}{center}{}{pgf@generic}{\pgfusepath{fill}}
+            \else
+                \pgfmathparse{\pgf@circ@res@up / \pgf@circ@Rlen / \ctikzvalof{bipoles/resistor/width} / 2}
+                \pgftransformscale{\pgfmathresult}
+                \pgfnode{resistorshape}{center}{}{pgf@resistor}{\pgfusepath{fill}}
+            \fi
+        }
+
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
+
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+        \pgfusepath{draw}
+
+    }
 }
 
 % electromechanical device (motor/generator)
 \pgfdeclareshape{elmech}
 {
-	\savedanchor\northwest{
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/height}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	  \anchor{text}{
-		\pgfpointorigin
-		\advance \pgf@x by -.5\wd\pgfnodeparttextbox
-		\advance \pgf@y by -.5\ht\pgfnodeparttextbox
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{right}{%
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{top}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{pathstart}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{pathend}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{bottom}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{center}{
-		\pgf@y=0pt
-		\pgf@x=0pt
-	}
-	\anchor{east}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{west}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	}
-		\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-		\pgf@circ@res@step=\ctikzvalof{tripoles/elmech/width}\pgf@circ@Rlen
-		\pgf@circ@res@up=\ctikzvalof{tripoles/elmech/height}\pgf@circ@Rlen
-		\pgfscope
-			\pgfstartlinewidth=\pgflinewidth
-			% draw outer box
-		%	\ifpgf@circuit@boxed
-		%		\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-		%	\fi
-			% draw outer circle
-			%\ifpgf@circuit@boxed
-			%	\pgf@circ@res@step=.7\pgf@circ@res@step
-			%	\pgfsetdash{}{0pt}	% draw solid circle if boxed
-			%\else
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			%\fi
-			\pgfpathrectangle{\pgfpoint{-.25\pgf@circ@res@step}{-.5\pgf@circ@res@up}}{\pgfpoint{.5\pgf@circ@res@step}{\pgf@circ@res@up}}
-			\pgfsetfillcolor{black}
-			\pgfusepath{draw,fill}
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfsetfillcolor{white}
-			\pgfusepath{draw,fill}
-		\endpgfscope
-	}
+    \savedanchor\northwest{
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/height}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{text}{
+        \pgfpointorigin
+        \advance \pgf@x by -.5\wd\pgfnodeparttextbox
+        \advance \pgf@y by -.5\ht\pgfnodeparttextbox
+    }
+    \anchor{left}{%
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{right}{%
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{top}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{pathstart}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{pathend}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{bottom}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{center}{
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgf@circ@res@step=\ctikzvalof{tripoles/elmech/width}\pgf@circ@Rlen
+        \pgf@circ@res@up=\ctikzvalof{tripoles/elmech/height}\pgf@circ@Rlen
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            \pgfscope % clip the bar: whole size minus the circle
+                \pgfpathrectanglecorners{\pgfpoint{-.5\pgf@circ@res@step}{-.5\pgf@circ@res@up}}{\pgfpoint{.5\pgf@circ@res@step}{.5\pgf@circ@res@up}}
+                \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+                \pgfseteorule
+                \pgfusepath{clip}
+                \pgfpathrectangle{\pgfpoint{-.25\pgf@circ@res@step}{-.5\pgf@circ@res@up}}{\pgfpoint{.5\pgf@circ@res@step}{\pgf@circ@res@up}}
+                \pgfsetfillcolor{black}
+                \pgfusepath{fill, draw}
+            \endpgfscope
+            \pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
+            \ifx\tikz@fillcolor\pgfutil@empty
+                \pgfsetfillcolor{white}
+            \else
+                \pgfsetfillcolor{\tikz@fillcolor}
+            \fi
+            \pgfusepath{draw, fill}
+        \endpgfscope
+    }
 }
 
 \pgfdeclareshape{magnetron}
 {
-	\savedanchor\northwest{
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/magnetron/width}\pgf@circ@Rlen
-			\pgf@y=.5\pgf@y
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/magnetron/width}\pgf@circ@Rlen
-			\pgf@x=.5\pgf@x
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{anode}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{cathode1}{
-		\northwest
-		\pgf@circ@res@step=\pgf@y
-		\pgfmathparse{cos(105)}
-		\pgf@x=\pgfmathresult\pgf@circ@res@step
-		\pgfmathparse{sin(105)}
-		\pgf@y=\pgfmathresult\pgf@circ@res@step
-		%\pgfpointorigin
-		%\pgfpathmoveto{\pgfpointpolar{105}{\pgf@circ@res@step}}%not working in a scaled tikzpicture
-	}
-	\anchor{cathode2}{
-		\northwest
-		\pgf@circ@res@step=\pgf@y
-		\pgfmathparse{cos(75)}
-		\pgf@x=\pgfmathresult\pgf@circ@res@step
-		\pgfmathparse{sin(75)}
-		\pgf@y=\pgfmathresult\pgf@circ@res@step
-		%\pgfpointorigin
-		%\pgfpathmoveto{\pgfpointpolar{75}{\pgf@circ@res@step}}%not working in a scaled tikzpicture
-	}
-	  \anchor{text}{
-		\pgfpointorigin
-		\advance \pgf@x by -.5\wd\pgfnodeparttextbox
-		\advance \pgf@y by -.5\ht\pgfnodeparttextbox
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{right}{%
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{top}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{pathstart}{
-		\northwest
-		\pgf@x=0pt
-	}
-	\anchor{pathend}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{bottom}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{center}{
-		\pgf@y=0pt
-		\pgf@x=0pt
-	}
-	\anchor{east}{
-		\northwest
-		\pgf@y=0pt
-		\pgf@x=-\pgf@x
-	}
-	\anchor{west}{
-		\northwest
-		\pgf@y=0pt
-	}
-	\anchor{south}{
-		\northwest
-		\pgf@x=0pt
-		\pgf@y=-\pgf@y
-	}
-	\anchor{north}{
-		\northwest
-		\pgf@x=0pt
-	}
-		\backgroundpath{
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
-		\pgf@circ@res@step=\ctikzvalof{tripoles/magnetron/width}\pgf@circ@Rlen
-			\northwest
-			\pgf@circ@res@up = \pgf@y 
-			\pgf@circ@res@down = -\pgf@y
-			\pgf@circ@res@right = -\pgf@x  
-			\pgf@circ@res@left = \pgf@x
-			\pgfmathsetlength{\pgf@circ@res@other}{sin(15)*\pgf@circ@res@up}
+    \savedanchor\northwest{
+        \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/magnetron/width}\pgf@circ@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/magnetron/width}\pgf@circ@Rlen
+        \pgf@x=.5\pgf@x
+    }
+    \anchor{center}{
+        \pgfpointorigin
+    }
+    \anchor{anode}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{cathode1}{
+        \northwest
+        \pgf@circ@res@step=\pgf@y
+        \pgfmathparse{cos(105)}
+        \pgf@x=\pgfmathresult\pgf@circ@res@step
+        \pgfmathparse{sin(105)}
+        \pgf@y=\pgfmathresult\pgf@circ@res@step
+        %\pgfpointorigin
+        %\pgfpathmoveto{\pgfpointpolar{105}{\pgf@circ@res@step}}%not working in a scaled tikzpicture
+    }
+    \anchor{cathode2}{
+        \northwest
+        \pgf@circ@res@step=\pgf@y
+        \pgfmathparse{cos(75)}
+        \pgf@x=\pgfmathresult\pgf@circ@res@step
+        \pgfmathparse{sin(75)}
+        \pgf@y=\pgfmathresult\pgf@circ@res@step
+        %\pgfpointorigin
+        %\pgfpathmoveto{\pgfpointpolar{75}{\pgf@circ@res@step}}%not working in a scaled tikzpicture
+    }
+    \anchor{text}{
+        \pgfpointorigin
+        \advance \pgf@x by -.5\wd\pgfnodeparttextbox
+        \advance \pgf@y by -.5\ht\pgfnodeparttextbox
+    }
+    \anchor{left}{%
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{right}{%
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{top}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{pathstart}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{pathend}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{bottom}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{center}{
+        \pgf@y=0pt
+        \pgf@x=0pt
+    }
+    \anchor{east}{
+        \northwest
+        \pgf@y=0pt
+        \pgf@x=-\pgf@x
+    }
+    \anchor{west}{
+        \northwest
+        \pgf@y=0pt
+    }
+    \anchor{south}{
+        \northwest
+        \pgf@x=0pt
+        \pgf@y=-\pgf@y
+    }
+    \anchor{north}{
+        \northwest
+        \pgf@x=0pt
+    }
+    \anchor{south west}{ \northwest \pgf@y=-\pgf@y }
+    \anchor{north east}{ \northwest \pgf@x=-\pgf@x }
+    \anchor{north west}{ \northwest }
+    \anchor{south east}{ \northwest \pgf@x=-\pgf@x \pgf@y=-\pgf@y }
+    \backgroundpath{
+        \pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
+        \pgf@circ@res@step=\ctikzvalof{tripoles/magnetron/width}\pgf@circ@Rlen
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        \pgfmathsetlength{\pgf@circ@res@other}{sin(15)*\pgf@circ@res@up}
 
-		\pgfscope
-			\pgfstartlinewidth=\pgflinewidth
-			% draw outer box
-		%	\ifpgf@circuit@boxed
-		%		\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-		%	\fi
-			% draw outer circle
-			%\ifpgf@circuit@boxed
-			%	\pgf@circ@res@step=.7\pgf@circ@res@step
-			%	\pgfsetdash{}{0pt}	% draw solid circle if boxed
-			%\else
-				\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			%\fi
-			%create outer circle
-			\pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@right}
-			\pgfsetfillcolor{white}
-			\pgfusepath{draw}
-			%create chambers
-			 \foreach \angle in {45,135,225,315}{
-						\pgfpathmoveto{ \pgfpointpolar{\angle}{0.6\pgf@circ@res@right}}
-						\pgfpathlineto{ \pgfpointpolar{\angle}{\pgf@circ@res@right}}
-					}
-			\pgfsetroundcap
-			\pgfusepath{draw}
-			\pgfscope
-			%draw connection from outside
-			%anode
-				\pgfsetlinewidth{\pgfstartlinewidth}
-				\pgfpathmoveto{\pgfpoint{0\pgf@circ@res@left}{\pgf@circ@res@down}}
-				\pgfpathlineto{\pgfpoint{0\pgf@circ@res@right}{.5\pgf@circ@res@down}}
-				%cathodes
-				\pgfpathmoveto{\pgfpointpolar{105}{\pgf@circ@res@up}}
-				\pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-				\pgfpathmoveto{\pgfpointpolar{75}{\pgf@circ@res@up}}
-				\pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-				\pgfsetbuttcap
-				\pgfusepath{draw}
-			\endpgfscope
-			%create cathode
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{0}{.15\pgf@circ@res@up}}
-			\pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{.5\pgf@circ@res@up}}
-						\pgfusepath{draw}
-			%create anode
-			\pgfpathmoveto{\pgfpoint{0.3\pgf@circ@res@left}{.5\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@right}{.5\pgf@circ@res@down}}
-			
-			\pgfsetbuttcap
-			\pgfusepath{draw}
-		\endpgfscope
-	}
+        \pgfscope
+            \pgfstartlinewidth=\pgflinewidth
+            \pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+            %create outer circle
+            \pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@right}
+            \pgf@circ@draworfill
+            %create chambers
+            \foreach \angle in {45,135,225,315}{
+                \pgfpathmoveto{ \pgfpointpolar{\angle}{0.6\pgf@circ@res@right}}
+                \pgfpathlineto{ \pgfpointpolar{\angle}{\pgf@circ@res@right}}
+            }
+            \pgfsetroundcap
+            \pgfusepath{draw}
+            \pgfscope
+                %draw connection from outside
+                %anode
+                \pgfsetlinewidth{\pgfstartlinewidth}
+                \pgfpathmoveto{\pgfpoint{0\pgf@circ@res@left}{\pgf@circ@res@down}}
+                \pgfpathlineto{\pgfpoint{0\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+                %cathodes
+                \pgfpathmoveto{\pgfpointpolar{105}{\pgf@circ@res@up}}
+                \pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+                \pgfpathmoveto{\pgfpointpolar{75}{\pgf@circ@res@up}}
+                \pgfpathlineto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+                \pgfsetbuttcap
+                \pgfusepath{draw}
+            \endpgfscope
+            %create cathode
+            \pgfpathmoveto{\pgfpoint{\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{0}{.15\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{-\pgf@circ@res@other}{.5\pgf@circ@res@up}}
+            \pgfusepath{draw}
+            %create anode
+            \pgfpathmoveto{\pgfpoint{0.3\pgf@circ@res@left}{.5\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@right}{.5\pgf@circ@res@down}}
+
+            \pgfsetbuttcap
+            \pgfusepath{draw}
+        \endpgfscope
+    }
 }
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
index 568eb05385a..826ac82bba9 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
@@ -5,11 +5,11 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %\def\pgf@circ@handleSI#1{%
  % \pgf@circ@siunitx@resfalse
-%  
+%
  % \edef\len{\stringlength[e]{#1}}
   %\testmatchingchar[e]{#1}{\len}{>}%
   %\ifmatchingchar%
@@ -19,43 +19,42 @@
 	  %\pgf@circ@siunitx@restrue
 %	\else
 %	\fi
-  %\else 
+  %\else
   %\fi
 %}
 
 \def\pgf@circ@handleSI#1{
-	\noexpandarg
-        	\def\pgf@temp{}
-	\StrBetween{#1}{<}{>}[\pgf@circ@handleSI@unit]
-	\StrLen{\pgf@circ@handleSI@unit}[\pgf@circ@handleSI@unit@len]
-
-	\ifnum\pgf@circ@handleSI@unit@len=0  
-	  \pgf@circ@siunitx@resfalse  
-	\else  
-	  \IfEndWith{#1}{>}{
-	  	\pgf@circ@siunitx@restrue 
-		\noexpandarg
-	  	\StrBefore{#1}{<}[\pgf@circ@handleSI@val]		
-                %\typeout{si |#1|}
-	  }{
-	  	\pgf@circ@siunitx@resfalse 
-                %\typeout{no si |#1|}
-	  }
-	\fi
+    \noexpandarg
+    \def\pgf@temp{}
+    \StrBetween{#1}{<}{>}[\pgf@circ@handleSI@unit]
+    \StrLen{\pgf@circ@handleSI@unit}[\pgf@circ@handleSI@unit@len]
+
+    \ifnum\pgf@circ@handleSI@unit@len=0
+    \pgf@circ@siunitx@resfalse
+    \else
+    \IfEndWith{#1}{>}{
+        \pgf@circ@siunitx@restrue
+        \noexpandarg
+        \StrBefore{#1}{<}[\pgf@circ@handleSI@val]
+        %\typeout{si |#1|}
+        }{
+        \pgf@circ@siunitx@resfalse
+        %\typeout{no si |#1|}
+    }
+\fi
 }
 
 \def\pgf@circ@ifkeyempty#1{
-	\pgfextra{
-		\ctikzset{#1/.get=\pgf@circ@temp}
-		\edef\pgf@temp{}
-	}
-	\ifx\pgf@circ@temp\pgf@temp
-}
+    \pgfextra{
+        \ctikzset{#1/.get=\pgf@circ@temp}
+        \edef\pgf@temp{}
+    }
+    \ifx\pgf@circ@temp\pgf@temp
+    }
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%    Math routines
 
 \def\pgf@circ@stripdecimals#1.#2\pgf@nil{#1}
 
-
-\endinput
\ No newline at end of file
+\endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
index 143f697ce04..62c10016603 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
@@ -5,38 +5,38 @@
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  Voltage management
 
 
 \ctikzset{v^>/.style = {
-		v = #1,
-		\circuitikzbasekey/bipole/voltage/direction = forward,
-		\circuitikzbasekey/bipole/voltage/position = above
-	}
+        v = #1,
+        \circuitikzbasekey/bipole/voltage/direction = forward,
+        \circuitikzbasekey/bipole/voltage/position = above
+    }
 }
 
 \ctikzset{v^</.style = {
-		v = #1,
-		\circuitikzbasekey/bipole/voltage/direction = backward,
-		\circuitikzbasekey/bipole/voltage/position = above
-	}
+        v = #1,
+        \circuitikzbasekey/bipole/voltage/direction = backward,
+        \circuitikzbasekey/bipole/voltage/position = above
+    }
 }
 
 \ctikzset{v_>/.style = {
-		v = #1,
-		\circuitikzbasekey/bipole/voltage/direction = forward,
-		\circuitikzbasekey/bipole/voltage/position = below
-	} 
+        v = #1,
+        \circuitikzbasekey/bipole/voltage/direction = forward,
+        \circuitikzbasekey/bipole/voltage/position = below
+    }
 }
 
 \ctikzset{v_</.style = {
-		v = #1,
-		\circuitikzbasekey/bipole/voltage/direction = backward,
-		\circuitikzbasekey/bipole/voltage/position = below
-	}
+        v = #1,
+        \circuitikzbasekey/bipole/voltage/direction = backward,
+        \circuitikzbasekey/bipole/voltage/position = below
+    }
 }
 
 \ctikzset{v_/.style = {v = #1, \circuitikzbasekey/bipole/voltage/position = below} }
@@ -47,305 +47,370 @@
 % Default position varies whether the component is a voltage source
 % or not
 \ctikzset{v/.code = {
-			\ifpgf@circuit@bipole@isvoltage
-				\pgfkeys{\circuitikzbasekey/bipole/voltage/position=above,
-					\circuitikzbasekey/bipole/voltage/direction=forward}
-			\else
-				\ifpgf@circ@oldvoltagedirection
-				\pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
-					\circuitikzbasekey/bipole/voltage/direction=backward}
-				\else
-				\pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
-					\circuitikzbasekey/bipole/voltage/direction=forward}
-				\fi
-			\fi
-			\ifpgf@circ@oldvoltagedirection\else
-			\ifpgf@circuit@bipole@iscurrent
-			\ifpgf@circuit@bipole@current@backward
-					\pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
-					\circuitikzbasekey/bipole/voltage/direction=forward}
-			\else
-					\pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
-					\circuitikzbasekey/bipole/voltage/direction=backward}
-			\fi\fi\fi
-	\pgfkeys{/tikz/circuitikz/bipole/voltage/label/name=#1}
-	\ctikzsetvalof{bipole/voltage/label/unit}{}
-	\ifpgf@circ@siunitx 
-		\pgf@circ@handleSI{#1}
-		\ifpgf@circ@siunitx@res
-			\edef\pgf@temp{\pgf@circ@handleSI@val}
-			\pgfkeyslet{/tikz/circuitikz/bipole/voltage/label/name}{\pgf@temp}
-			\edef\pgf@temp{\pgf@circ@handleSI@unit}
-			\pgfkeyslet{/tikz/circuitikz/bipole/voltage/label/unit}{\pgf@temp}
-		\else
-		\fi
-	\else
-	\fi
-	}
+        \ifpgf@circuit@bipole@isvoltage
+            \pgfkeys{\circuitikzbasekey/bipole/voltage/position=above,
+            \circuitikzbasekey/bipole/voltage/direction=forward}
+        \else
+            \ifpgf@circ@oldvoltagedirection
+                \pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
+                \circuitikzbasekey/bipole/voltage/direction=backward}
+            \else
+                \pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
+                \circuitikzbasekey/bipole/voltage/direction=forward}
+            \fi
+        \fi
+        \ifpgf@circ@oldvoltagedirection
+            \ifpgf@circuit@bipole@iscurrent\ifpgf@circ@fixbatteries
+                \pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
+                \circuitikzbasekey/bipole/voltage/direction=forward}
+        \fi\fi
+        \else
+        \ifpgf@circuit@bipole@iscurrent
+            \ifpgf@circuit@bipole@current@backward
+                \pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
+                \circuitikzbasekey/bipole/voltage/direction=forward}
+            \else
+                \pgfkeys{\circuitikzbasekey/bipole/voltage/position=below,
+                \circuitikzbasekey/bipole/voltage/direction=backward}
+            \fi\fi\fi
+            \pgfkeys{/tikz/circuitikz/bipole/voltage/label/name=#1}
+            \ctikzsetvalof{bipole/voltage/label/unit}{}
+            \ifpgf@circ@siunitx
+                \pgf@circ@handleSI{#1}
+                \ifpgf@circ@siunitx@res
+                    \edef\pgf@temp{\pgf@circ@handleSI@val}
+                    \pgfkeyslet{/tikz/circuitikz/bipole/voltage/label/name}{\pgf@temp}
+                    \edef\pgf@temp{\pgf@circ@handleSI@unit}
+                    \pgfkeyslet{/tikz/circuitikz/bipole/voltage/label/unit}{\pgf@temp}
+                \else
+            \fi
+            \else
+        \fi
+    }
 }
 
-
-
+% american voltage font selection and symbol definition
+% the default font command is {} --- nothing
+\def\pgf@circ@avfont{\ctikzvalof{voltage/american font}}
+%
+% plus and minus symbols (default is $+$ and $-$, see pgfcirc.defines.tex)
+% notice that the double braces are needed  to be able
+% to use \boldmath in the font (although it is semi-deprecated...)
+%
+\def\pgf@circ@avplus{\ctikzvalof{voltage/american plus}}
+\def\pgf@circ@avminus{\ctikzvalof{voltage/american minus}}
 
 %% Output routine for generic bipoles
 
 \def\pgf@circ@drawvoltagegeneric{
-	\pgfextra{
-			\edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/straight label distance}
-			\pgfkeysifdefined{\pgf@temp}
-				{ 
-					\edef\partheight{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/straight label distance}}
-					\edef\tmpdistfromline{(\partheight\pgf@circ@Rlen)}
-				}
-				{
-				\pgfkeysifdefined{/tikz/circuitikz/bipoles/voltage/straight label distance}
-					{
-						\edef\partheight{\ctikzvalof{bipoles/voltage/straight label distance}}
-						\edef\tmpdistfromline{(\partheight\pgf@circ@Rlen)}
-					}
-					{%calculate default value from part height
-						\edef\partheight{0.5*\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/height}}
-						\edef\tmpdistfromline{(\partheight\pgf@circ@Rlen+0.2\pgf@circ@Rlen)}
-					}
-				}
-		\ifnum \ctikzvalof{mirror value}=-1
-			\ifpgf@circuit@bipole@inverted
-				\ifpgf@circuit@bipole@voltage@straight
-					\def\distfromline{\tmpdistfromline}
-				\else
-					\def\distfromline{\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
-				\fi
-			\else
-				\ifpgf@circuit@bipole@voltage@straight
-					\def\distfromline{-\tmpdistfromline}
-				\else
-					\def\distfromline{-\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
-				\fi
-			\fi
-		\else
-			\ifpgf@circuit@bipole@inverted
-				\ifpgf@circuit@bipole@voltage@straight
-					\def\distfromline{-\tmpdistfromline}
-				\else
-					\def\distfromline{-\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
-				\fi
-			\else
-				\ifpgf@circuit@bipole@voltage@straight
-					\def\distfromline{\tmpdistfromline}
-				\else
-					\def\distfromline{\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
-				\fi
-			\fi
-		\fi
-		\ifpgf@circuit@bipole@voltage@below
-			\def\pgf@circ@voltage@angle{90}
-		\else
-			\def\pgf@circ@voltage@angle{-90}
-		\fi
-		\edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/distance from node}
-		\pgfkeysifdefined{\pgf@temp}
-			{ \edef\distacefromnode{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/distance from node}} }
-			{ \edef\distacefromnode{\ctikzvalof{voltage/distance from node}} }
-		\edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/bump b}
-		\pgfkeysifdefined{\pgf@temp}
-			{ \edef\bumpb{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/bump b}} }
-			{ \edef\bumpb{\ctikzvalof{voltage/bump b}} }
-	}
-	% %\pgf@circ@Rlen/16 is equal to the length of the currarrow
-	coordinate (pgfcirc@midtmp) at ($(\tikztostart) ! \pgf@circ@Rlen/16 ! (anchorstartnode)$) %absolute move, minimum space is length of arrowhead
-	coordinate (pgfcirc@midtmp) at ($(pgfcirc@midtmp) ! \distacefromnode ! (anchorstartnode)$)
+    \pgfextra{
+        \edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/straight label distance}
+        \pgfkeysifdefined{\pgf@temp}
+        {
+            \edef\partheight{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/straight label distance}}
+            \edef\tmpdistfromline{(\partheight\pgf@circ@Rlen)}
+        }
+        {
+            \pgfkeysifdefined{/tikz/circuitikz/bipoles/voltage/straight label distance}
+            {
+                \edef\partheight{\ctikzvalof{bipoles/voltage/straight label distance}}
+                \edef\tmpdistfromline{(\partheight\pgf@circ@Rlen)}
+            }
+            {%calculate default value from part height
+                \edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/height}
+                \pgfkeysifdefined{\pgf@temp}
+                {
+                    \edef\partheight{0.5*\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/height}}
+                    \edef\tmpdistfromline{(\partheight\pgf@circ@Rlen+0.2\pgf@circ@Rlen)}
+                }
+                {
+                    \edef\tmpdistfromline{(.5\pgf@circ@Rlen)} %fallback to fixed value
+                }
+            }
+        }
+        \ifnum \ctikzvalof{mirror value}=-1
+        \ifpgf@circuit@bipole@inverted
+            \ifpgf@circuit@bipole@voltage@straight
+                \def\distfromline{\tmpdistfromline}
+            \else
+                \def\distfromline{\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
+            \fi
+            \else
+            \ifpgf@circuit@bipole@voltage@straight
+                \def\distfromline{-\tmpdistfromline}
+            \else
+                \def\distfromline{-\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
+            \fi
+        \fi
+        \else
+            \ifpgf@circuit@bipole@inverted
+                \ifpgf@circuit@bipole@voltage@straight
+                    \def\distfromline{-\tmpdistfromline}
+                \else
+                    \def\distfromline{-\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
+                \fi
+                \else
+                \ifpgf@circuit@bipole@voltage@straight
+                    \def\distfromline{\tmpdistfromline}
+                \else
+                    \def\distfromline{\ctikzvalof{voltage/distance from line}\pgf@circ@Rlen}
+                \fi
+            \fi
+        \fi
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@voltage@angle{90}
+        \else
+            \def\pgf@circ@voltage@angle{-90}
+        \fi
+        \edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/distance from node}
+        \pgfkeysifdefined{\pgf@temp}
+        { \edef\distacefromnode{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/distance from node}} }
+        { \edef\distacefromnode{\ctikzvalof{voltage/distance from node}} }
+        \edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/bump b}
+        \pgfkeysifdefined{\pgf@temp}
+        { \edef\bumpb{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/bump b}} }
+        { \edef\bumpb{\ctikzvalof{voltage/bump b}} }
+        \edef\shiftv{\ctikzvalof{voltage/shift}}
+        \pgfmathsetmacro{\bumpb}{\bumpb + \shiftv} %% adjust the bump is shift
+        \ifpgf@circuit@bipole@inverted
+            \pgfmathsetmacro{\shiftv}{-\shiftv}
+        \fi
+        \ifnum \ctikzvalof{mirror value} = -1
+            \pgfmathsetmacro{\shiftv}{-\shiftv}
+        \fi
+    }
+    % %\pgf@circ@Rlen/\pgfkeysvalueof{/tikz/circuitikz/current arrow scale} is equal to the length of the currarrow
+    coordinate (pgfcirc@midtmp) at ($(\tikztostart) ! \pgf@circ@Rlen/\pgfkeysvalueof{/tikz/circuitikz/current arrow scale} ! (anchorstartnode)$) %absolute move, minimum space is length of arrowhead
+    coordinate (pgfcirc@midtmp) at ($(pgfcirc@midtmp) ! \distacefromnode ! (anchorstartnode)$)
 
-	coordinate (pgfcirc@Vfrom) at ($(pgfcirc@midtmp) ! -\distfromline ! \pgf@circ@voltage@angle:(anchorstartnode)$)
-	coordinate (pgfcirc@midtmp) at ($(\tikztotarget) ! \pgf@circ@Rlen/16 ! (anchorendnode)$)%absolute move, minimum space is length of arrowhead
-	coordinate (pgfcirc@midtmp) at ($(pgfcirc@midtmp) ! \distacefromnode ! (anchorendnode)$)
+    coordinate (pgfcirc@Vfrom) at ($(pgfcirc@midtmp) ! -\distfromline ! \pgf@circ@voltage@angle:(anchorstartnode)$)
+    coordinate (pgfcirc@midtmp) at ($(\tikztotarget) ! \pgf@circ@Rlen/\pgfkeysvalueof{/tikz/circuitikz/current arrow scale} ! (anchorendnode)$)%absolute move, minimum space is length of arrowhead
+    coordinate (pgfcirc@midtmp) at ($(pgfcirc@midtmp) ! \distacefromnode ! (anchorendnode)$)
 
-	coordinate (pgfcirc@Vto) at ($(pgfcirc@midtmp) ! \distfromline ! \pgf@circ@voltage@angle : (anchorendnode)$)
+    coordinate (pgfcirc@Vto) at ($(pgfcirc@midtmp) ! \distfromline ! \pgf@circ@voltage@angle : (anchorendnode)$)
 
-	\ifpgf@circuit@bipole@voltage@below
-		coordinate (pgfcirc@Vcont1) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-110)$)
-		coordinate (pgfcirc@Vcont2) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-70)$)
-	\else
-		coordinate (pgfcirc@Vcont1) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.110)$)
-		coordinate (pgfcirc@Vcont2) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.70)$)
-	\fi
+    \ifpgf@circuit@bipole@voltage@below
+        coordinate (pgfcirc@Vto) at ($(pgfcirc@Vto) ! \shiftv!90 :  (anchorendnode)$)
+        coordinate (pgfcirc@Vfrom) at ($(pgfcirc@Vfrom) ! \shiftv!-90 :  (anchorstartnode)$)
+        coordinate (pgfcirc@Vcont1) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-110)$)
+        coordinate (pgfcirc@Vcont2) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-70)$)
+    \else
+        coordinate (pgfcirc@Vto) at ($(pgfcirc@Vto) ! -\shiftv!90 :  (anchorendnode)$)
+        coordinate (pgfcirc@Vfrom) at ($(pgfcirc@Vfrom) ! -\shiftv!-90 :  (anchorstartnode)$)
+        coordinate (pgfcirc@Vcont1) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.110)$)
+        coordinate (pgfcirc@Vcont2) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.70)$)
+    \fi
 
-	\ifpgf@circuit@europeanvoltage
-		\ifpgf@circuit@bipole@voltage@straight
-			\ifpgf@circuit@bipole@voltage@backward
-				(pgfcirc@Vto) --(pgfcirc@Vfrom) node[currarrow, sloped,  allow upside down, pos=1,anchor=tip] {}
-			\else
-				(pgfcirc@Vfrom) --(pgfcirc@Vto) node[currarrow, sloped,  allow upside down, pos=1,anchor=tip] {}
-			\fi
-		\else
-			\ifpgf@circuit@bipole@voltage@backward
-				(pgfcirc@Vto) .. controls (pgfcirc@Vcont2)  and (pgfcirc@Vcont1) ..
-					node[currarrow, sloped,  allow upside down, pos=1] {}
-				(pgfcirc@Vfrom)
-			\else
-				(pgfcirc@Vfrom) .. controls (pgfcirc@Vcont1)  and (pgfcirc@Vcont2) ..
-					node[currarrow, sloped,  allow upside down, pos=1] {}
-				(pgfcirc@Vto)
-			\fi
-		\fi
-	\else
-		\ifpgf@circuit@bipole@voltage@backward
-			\ifpgf@circ@oldvoltagedirection
-				(pgfcirc@Vfrom) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{\scriptsize$+$}
-				(pgfcirc@Vto) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{$-$}
-			\else
-				(pgfcirc@Vfrom) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{\scriptsize$-$}
-				(pgfcirc@Vto) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{$+$}
-			\fi
-		\else
-			\ifpgf@circ@oldvoltagedirection
-				(pgfcirc@Vfrom) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{\scriptsize$-$}
-				(pgfcirc@Vto) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{$+$}
-			\else
-				(pgfcirc@Vfrom) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{\scriptsize$+$}
-				(pgfcirc@Vto) node[inner sep=0, anchor=\pgf@circ@bipole@voltage@label@anchor]{$-$}
-			\fi
-		\fi
-	\fi
+    \ifpgf@circuit@europeanvoltage
+        \ifpgf@circuit@bipole@voltage@straight
+            \ifpgf@circuit@bipole@voltage@backward
+                (pgfcirc@Vto) --(pgfcirc@Vfrom) node[currarrow, sloped,  allow upside down, pos=1,anchor=tip] {}
+            \else
+                (pgfcirc@Vfrom) --(pgfcirc@Vto) node[currarrow, sloped,  allow upside down, pos=1,anchor=tip] {}
+            \fi
+            \else
+            \ifpgf@circuit@bipole@voltage@backward
+                (pgfcirc@Vto) .. controls (pgfcirc@Vcont2)  and (pgfcirc@Vcont1) ..
+                node[currarrow, sloped,  allow upside down, pos=1] {}
+                (pgfcirc@Vfrom)
+            \else
+                (pgfcirc@Vfrom) .. controls (pgfcirc@Vcont1)  and (pgfcirc@Vcont2) ..
+                node[currarrow, sloped,  allow upside down, pos=1] {}
+                (pgfcirc@Vto)
+            \fi
+        \fi
+        \else
+        \ifpgf@circuit@bipole@voltage@backward
+            \ifpgf@circ@oldvoltagedirection
+                (pgfcirc@Vfrom) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avplus}
+                (pgfcirc@Vto) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avminus}
+            \else
+                (pgfcirc@Vfrom) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avminus}
+                (pgfcirc@Vto) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avplus}
+            \fi
+            \else
+            \ifpgf@circ@oldvoltagedirection
+                (pgfcirc@Vfrom) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avminus}
+                (pgfcirc@Vto) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avplus}
+            \else
+                (pgfcirc@Vfrom) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avplus}
+                (pgfcirc@Vto) node[inner sep=0, node font=\pgf@circ@avfont,
+                    anchor=\pgf@circ@bipole@voltage@label@anchor]{\pgf@circ@avminus}
+            \fi
+        \fi
+    \fi
 }
 
 %% Output routine for voltage sources
 \def\pgf@circ@drawvoltagegenerator{
-	\ifpgf@circuit@bipole@voltage@below
-		coordinate (pgfcirc@Vfrom) at ($(\ctikzvalof{bipole/name}.center) ! \ctikzvalof{voltage/bump a} ! (\ctikzvalof{bipole/name}.-120)$)
-		coordinate (pgfcirc@Vto) at ($(\ctikzvalof{bipole/name}.center) ! \ctikzvalof{voltage/bump a} ! (\ctikzvalof{bipole/name}.-60)$)
-	\else
-		coordinate (pgfcirc@Vfrom) at ($ (\ctikzvalof{bipole/name}.center) ! \ctikzvalof{voltage/bump a} ! (\ctikzvalof{bipole/name}.120)$)
-		coordinate (pgfcirc@Vto) at ($ (\ctikzvalof{bipole/name}.center) ! \ctikzvalof{voltage/bump a} ! (\ctikzvalof{bipole/name}.60)$)
-	\fi
-	\ifpgf@circuit@europeanvoltage
-		\ifpgf@circuit@bipole@voltage@backward
-			(pgfcirc@Vto)  -- node[currarrow, sloped,  allow upside down, pos=1] {} (pgfcirc@Vfrom)
-		\else
-			(pgfcirc@Vfrom)  -- node[currarrow, sloped,  allow upside down, pos=1] {} (pgfcirc@Vto)
-		\fi
-	\else% american voltage
-		\ifpgf@circuit@bipole@voltageoutsideofsymbol
-		% if it is a battery, must put + and -
-			\ifpgf@circuit@bipole@voltage@backward
-				(pgfcirc@Vfrom)  node {$-$}  (pgfcirc@Vto) node {$+$}
-			\else
-				(pgfcirc@Vfrom)  node {$+$}  (pgfcirc@Vto) node {$-$}
-			\fi
-		\fi
-	\fi
+    % the following is affected indirectly by voltage/shift, you can move the arrow with voltage/bump a.
+    % it's not perfect, but I can't find the way to do it correctly...
+    \pgfextra{
+        \edef\shiftv{\ctikzvalof{voltage/shift}}
+        \edef\bumpa{\ctikzvalof{voltage/bump a}}
+        \pgfmathsetmacro{\bumpaplus}{\bumpa + \shiftv}
+    }
+    \ifpgf@circuit@bipole@voltage@below
+        coordinate (pgfcirc@Vfrom) at ($(\ctikzvalof{bipole/name}.center) ! \bumpaplus ! (\ctikzvalof{bipole/name}.-120)$)
+        coordinate (pgfcirc@Vto) at ($(\ctikzvalof{bipole/name}.center) ! \bumpaplus ! (\ctikzvalof{bipole/name}.-60)$)
+    \else
+        coordinate (pgfcirc@Vfrom) at ($ (\ctikzvalof{bipole/name}.center) ! \bumpaplus ! (\ctikzvalof{bipole/name}.120)$)
+        coordinate (pgfcirc@Vto) at ($ (\ctikzvalof{bipole/name}.center) ! \bumpaplus ! (\ctikzvalof{bipole/name}.60)$)
+    \fi
+    \ifpgf@circuit@europeanvoltage
+        \ifpgf@circuit@bipole@voltage@backward
+            (pgfcirc@Vto)  -- node[currarrow, sloped,  allow upside down, pos=1] {} (pgfcirc@Vfrom)
+        \else
+            (pgfcirc@Vfrom)  -- node[currarrow, sloped,  allow upside down, pos=1] {} (pgfcirc@Vto)
+        \fi
+        \else% american voltage
+        \ifpgf@circuit@bipole@voltageoutsideofsymbol
+            % if it is a battery, must put + and -
+
+            \ifpgf@circ@fixbatteries
+                \ifpgf@circuit@bipole@voltage@backward
+                    (pgfcirc@Vfrom)  node[node font=\pgf@circ@avfont] {\pgf@circ@avplus}
+                    (pgfcirc@Vto) node[node font=\pgf@circ@avfont] {\pgf@circ@avminus}
+                \else
+                    (pgfcirc@Vfrom)  node[node font=\pgf@circ@avfont] {\pgf@circ@avminus}
+                    (pgfcirc@Vto) node[node font=\pgf@circ@avfont] {\pgf@circ@avplus}
+                \fi
+                \else
+                \ifpgf@circuit@bipole@voltage@backward
+                    (pgfcirc@Vfrom)  node[node font=\pgf@circ@avfont] {\pgf@circ@avminus}
+                    (pgfcirc@Vto) node[node font=\pgf@circ@avfont] {\pgf@circ@avplus}
+                \else
+                    (pgfcirc@Vfrom)  node[node font=\pgf@circ@avfont] {\pgf@circ@avplus}
+                    (pgfcirc@Vto) node[node font=\pgf@circ@avfont] {\pgf@circ@avminus}
+                \fi
+            \fi
+        \fi
+    \fi
 }
 
 %% Output routine
-\def\pgf@circ@drawvoltage{% node name 
-%\pgf@circ@direction
-	\pgfextra{
-		\edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-		\ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
-			\ifpgf@circuit@bipole@voltage@below
-				\def\pgf@circ@bipole@voltage@label@anchor{north west}
-			\else \def\pgf@circ@bipole@voltage@label@anchor{south east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
-			\ifpgf@circuit@bipole@voltage@below
-				\def\pgf@circ@bipole@voltage@label@anchor{west}
-			\else \def\pgf@circ@bipole@voltage@label@anchor{east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
-			\ifpgf@circuit@bipole@voltage@below
-				 \def\pgf@circ@bipole@voltage@label@anchor{south west}
-			\else \def\pgf@circ@bipole@voltage@label@anchor{north east}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
-			\ifpgf@circuit@bipole@voltage@below
-				  \def\pgf@circ@bipole@voltage@label@anchor{south}
-			\else\def\pgf@circ@bipole@voltage@label@anchor{north}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
-			\ifpgf@circuit@bipole@voltage@below
-				 \def\pgf@circ@bipole@voltage@label@anchor{south east}
-			\else\def\pgf@circ@bipole@voltage@label@anchor{north west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
-			\ifpgf@circuit@bipole@voltage@below
-				 \def\pgf@circ@bipole@voltage@label@anchor{east}
-			\else \def\pgf@circ@bipole@voltage@label@anchor{west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
-			\ifpgf@circuit@bipole@voltage@below
-				  \def\pgf@circ@bipole@voltage@label@anchor{north east}
-			\else\def\pgf@circ@bipole@voltage@label@anchor{south west}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >-1 \ifnum\pgfcircmathresult <5
-			\ifpgf@circuit@bipole@voltage@below
-				 \def\pgf@circ@bipole@voltage@label@anchor{north}
-			\else\def\pgf@circ@bipole@voltage@label@anchor{south}
-			\fi
-		\fi\fi
-		\ifnum\pgfcircmathresult >355 \ifnum\pgfcircmathresult <361
-			\ifpgf@circuit@bipole@voltage@below
-				  \def\pgf@circ@bipole@voltage@label@anchor{north}
-			\else\def\pgf@circ@bipole@voltage@label@anchor{south}
-			\fi
-		\fi\fi
+\def\pgf@circ@drawvoltage{% node name
+    \pgfextra{ %WARNING: indentation is probably wrong
+        \edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+        \ifnum\pgfcircmathresult >4 \ifnum\pgfcircmathresult <86
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{north west}
+        \else
+            \def\pgf@circ@bipole@voltage@label@anchor{south east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >85 \ifnum\pgfcircmathresult <95
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{west}
+        \else
+            \def\pgf@circ@bipole@voltage@label@anchor{east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >94 \ifnum\pgfcircmathresult <176
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{south west}
+        \else \def\pgf@circ@bipole@voltage@label@anchor{north east}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >175 \ifnum\pgfcircmathresult <185
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{south}
+        \else\def\pgf@circ@bipole@voltage@label@anchor{north}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >184 \ifnum\pgfcircmathresult <266
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{south east}
+        \else\def\pgf@circ@bipole@voltage@label@anchor{north west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >265 \ifnum\pgfcircmathresult <275
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{east}
+        \else \def\pgf@circ@bipole@voltage@label@anchor{west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >274 \ifnum\pgfcircmathresult <356
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{north east}
+        \else\def\pgf@circ@bipole@voltage@label@anchor{south west}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >-1 \ifnum\pgfcircmathresult <5
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{north}
+        \else\def\pgf@circ@bipole@voltage@label@anchor{south}
+        \fi
+        \fi\fi
+        \ifnum\pgfcircmathresult >355 \ifnum\pgfcircmathresult <361
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@anchor{north}
+        \else\def\pgf@circ@bipole@voltage@label@anchor{south}
+        \fi
+        \fi\fi
+
+        \ifnum \ctikzvalof{mirror value}=-1
+            \ifpgf@circuit@bipole@voltage@below
+                \pgf@circuit@bipole@voltage@belowfalse
+            \else
+                \pgf@circuit@bipole@voltage@belowtrue
+            \fi
+        \fi
 
-		\ifnum \ctikzvalof{mirror value}=-1
-			\ifpgf@circuit@bipole@voltage@below
-				\pgf@circuit@bipole@voltage@belowfalse
-			\else
-				\pgf@circuit@bipole@voltage@belowtrue
-			\fi
-		\fi
+        \ifpgf@circuit@bipole@inverted
+            \ifpgf@circuit@bipole@voltage@below
+                \pgf@circuit@bipole@voltage@belowfalse
+            \else
 
-		\ifpgf@circuit@bipole@inverted
-			\ifpgf@circuit@bipole@voltage@below
-				\pgf@circuit@bipole@voltage@belowfalse
-			\else
-				\pgf@circuit@bipole@voltage@belowtrue
-			\fi
-		\fi
+                \pgf@circuit@bipole@voltage@belowtrue
+            \fi
+        \fi
 
-		\ifpgf@circuit@bipole@voltage@below
-			\def\pgf@circ@bipole@voltage@label@where{-90}
-		\else
-			\def\pgf@circ@bipole@voltage@label@where{90}
-		\fi
+        \ifpgf@circuit@bipole@voltage@below
+            \def\pgf@circ@bipole@voltage@label@where{-90}
+        \else
+            \def\pgf@circ@bipole@voltage@label@where{90}
+        \fi
 
 
-		\edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/european label distance}
-		\pgfkeysifdefined{\pgf@temp}
-			{ \edef\eudist{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/european label distance}} }
-			{ \edef\eudist{\ctikzvalof{voltage/european label distance}} }
+        \edef\pgf@temp{/tikz/circuitikz/bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/european label distance}
+        \pgfkeysifdefined{\pgf@temp}
+        { \edef\eudist{\ctikzvalof{bipoles/\pgfkeysvalueof{/tikz/circuitikz/bipole/kind}/voltage/european label distance}} }
+        { \edef\eudist{\ctikzvalof{voltage/european label distance}} }
+        \edef\shiftv{\ctikzvalof{voltage/shift}}
+        % adjust the label distance to the shift.
+        \pgfmathsetmacro{\eudistplus}{\eudist+\shiftv}
 
-	\pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
-	}%end pgfextra
+        \pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
+    }%end pgfextra
 
-		\ifpgf@circuit@bipole@isvoltage
-			\pgf@circ@drawvoltagegenerator
-		\else
-			\pgf@circ@drawvoltagegeneric
-		\fi
+    \ifpgf@circuit@bipole@isvoltage
+        \pgf@circ@drawvoltagegenerator
+    \else
+        \pgf@circ@drawvoltagegeneric
+    \fi
 
-	%	(\ctikzvalof{bipole/name}.\pgf@circ@bipole@voltage@label@where) %Zeile sinnlos!?
-		\ifpgf@circuit@bipole@voltage@straight
-			coordinate (Vlab) at ($(pgfcirc@Vto)!0.5!(pgfcirc@Vfrom) $)
-			node [anchor=\pgf@circ@bipole@voltage@label@anchor, inner sep=2pt]
-					  at (Vlab) { \pgf@circ@finallabels{voltage/label} }
-		\else
-		coordinate (Vlab) at ($(\ctikzvalof{bipole/name}.center) !
-			\ifpgf@circuit@europeanvoltage
-				\eudist
-			\else
-				\ctikzvalof{voltage/american label distance}
-			\fi !
-			(\ctikzvalof{bipole/name}.\pgf@circ@bipole@voltage@label@where)$)
-		node [anchor=\pgf@circ@bipole@voltage@label@anchor, inner sep=2pt] at (Vlab) { \pgf@circ@finallabels{voltage/label} }
-		\fi
+    %	(\ctikzvalof{bipole/name}.\pgf@circ@bipole@voltage@label@where) %Zeile sinnlos!?
+    \ifpgf@circuit@bipole@voltage@straight
+        coordinate (Vlab) at ($(pgfcirc@Vto)!0.5!(pgfcirc@Vfrom) $)
+        node [anchor=\pgf@circ@bipole@voltage@label@anchor, inner sep=2pt]
+        at (Vlab) { \pgf@circ@finallabels{voltage/label} }
+    \else
+        coordinate (Vlab) at ($(\ctikzvalof{bipole/name}.center) !
+        \ifpgf@circuit@europeanvoltage
+            \eudistplus
+        \else
+            \ctikzvalof{voltage/american label distance}
+        \fi !
+        (\ctikzvalof{bipole/name}.\pgf@circ@bipole@voltage@label@where)$)
+        node [anchor=\pgf@circ@bipole@voltage@label@anchor, inner sep=2pt] at (Vlab) { \pgf@circ@finallabels{voltage/label} }
+    \fi
 }%end drawvoltages
 \endinput
diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
index d12a46f279f..c52499a7df2 100644
--- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
+++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
@@ -1,303 +1,337 @@
-% Copyright 2007-2016 by Massimo Redaelli
+% Copyright 2007-2019 by Massimo Redaelli
 %
 % This file may be distributed and/or modified
 %
 % 1. under the LaTeX Project Public License and/or
 % 2. under the GNU Public License.
 %
-% See the file doc/LICENSE for more details.
-
+% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
 \NeedsTeXFormat{LaTeX2e}
 
-\def\pgfcircversion{0.8.3}
-\def\pgfcircversiondate{2017/05/28}
+\def\pgfcircversion{0.9.0}
+\def\pgfcircversiondate{2019/05/10}
 
 \ProvidesPackage{circuitikz}%
-        [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
+[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
 
 %% Version 3.0 of pgf/TikZ is required
 \RequirePackage{tikz}
 \usetikzlibrary{calc}
-\usepgflibrary{arrows}
-
+%
+% "arrows" library is deprecated, and behave badly with
+% arrows on short paths. Change to the new arrows.meta
+% In pfgcirc.define, we will add the old definition of
+% latex' which we have lost in the transition
+%
+\usetikzlibrary{arrows.meta, bending}
 
 % The options are listed in the manual in this order
 
 \DeclareOption{europeanvoltage}{
-	\ctikzset{voltage=european}
+    \ctikzset{voltage=european}
 }
 
 \DeclareOption{straightvoltages}{
-	\pgf@circuit@bipole@voltage@straighttrue
+    \pgf@circuit@bipole@voltage@straighttrue
 }
 
 \DeclareOption{americanvoltage}{
-	\ctikzset{voltage=american}
+    \ctikzset{voltage=american}
 }
 
 \DeclareOption{europeancurrent}{
-	\ctikzset{current = european}
+    \ctikzset{current = european}
 }
 
 \DeclareOption{americancurrent}{
-	\ctikzset{current = american}
+    \ctikzset{current = american}
 }
 
 
 
 \DeclareOption{americanresistor}{
-	\ctikzset{resistor = american}
+    \ctikzset{resistor = american}
 }
 
 \DeclareOption{europeanresistor}{
-	\ctikzset{resistor = european}
+    \ctikzset{resistor = european}
 }
 
 \DeclareOption{americaninductor}{
-	\ctikzset{inductor = american}
+    \ctikzset{inductor = american}
 }
 
 \DeclareOption{europeaninductor}{
-	\ctikzset{inductor = european}
+    \ctikzset{inductor = european}
 }
 
 \DeclareOption{cuteinductor}{
-	\ctikzset{inductor = cute}
+    \ctikzset{inductor = cute}
 }
 
 \DeclareOption{americanport}{
-	\ctikzset{logic ports = american}
+    \ctikzset{logic ports = american}
 }
 
 \DeclareOption{europeanport}{
-	\ctikzset{logic ports = european}
+    \ctikzset{logic ports = european}
 }
 
 \DeclareOption{europeanport}{
-	\ctikzset{logic ports = european}
+    \ctikzset{logic ports = european}
 }
 
 \DeclareOption{european}{
-	\ctikzset{voltage=european} \ctikzset{current=european} \ctikzset{inductor=european}
-	 \ctikzset{resistor=european} \ctikzset{logic ports=european} \ctikzset{gas filled surge arrester choice = european}
+    \ctikzset{voltage=european} \ctikzset{current=european} \ctikzset{inductor=european}
+    \ctikzset{resistor=european} \ctikzset{logic ports=european} \ctikzset{gas filled surge arrester choice = european}
 }
 
 \DeclareOption{american}{
-	\ctikzset{voltage=american} \ctikzset{current=american} \ctikzset{resistor=american} \ctikzset{inductor=american} \ctikzset{gas filled surge arrester choice = american}
-	\ctikzset{logic ports = american}
+    \ctikzset{voltage=american} \ctikzset{current=american} \ctikzset{resistor=american} \ctikzset{inductor=american} \ctikzset{gas filled surge arrester choice = american}
+    \ctikzset{logic ports = american}
 }
 
 \DeclareOption{fulldiodes}{
-	\ctikzset{diode = full}
+    \ctikzset{diode = full}
 }
 
 \DeclareOption{emptydiodes}{
-	\ctikzset{diode = empty}
+    \ctikzset{diode = empty}
 }
 
 \DeclareOption{europeanvoltages}{
-	\ctikzset{voltage=european}
+    \ctikzset{voltage=european}
 }
 
 \DeclareOption{americanvoltages}{
-	\ctikzset{voltage=american}
+    \ctikzset{voltage=american}
 }
 
 \DeclareOption{europeancurrents}{
-	\ctikzset{current = european}
+    \ctikzset{current = european}
 }
 
 \DeclareOption{americancurrents}{
-	\ctikzset{current = american}
+    \ctikzset{current = american}
 }
 
 \DeclareOption{americanresistors}{
-	\ctikzset{resistor = american}
+    \ctikzset{resistor = american}
 }
 
 \DeclareOption{europeanresistors}{
-	\ctikzset{resistor = european}
+    \ctikzset{resistor = european}
 }
 
 \DeclareOption{americaninductors}{
-	\ctikzset{inductor = american}
+    \ctikzset{inductor = american}
 }
 
 \DeclareOption{europeaninductors}{
-	\ctikzset{inductor = european}
+    \ctikzset{inductor = european}
 }
 
 \DeclareOption{cuteinductors}{
-	\ctikzset{inductor = cute}
+    \ctikzset{inductor = cute}
 }
 
 \DeclareOption{americanports}{
-	\ctikzset{logic ports = american}
+    \ctikzset{logic ports = american}
 }
 
 \DeclareOption{europeanports}{
-	\ctikzset{logic ports = european}
+    \ctikzset{logic ports = european}
 }
 
 \DeclareOption{americangfsurgearrester}{
-	\ctikzset{gas filled surge arrester choice = american}
+    \ctikzset{gas filled surge arrester choice = american}
 }
 
 \DeclareOption{europeangfsurgearrester}{
-	\ctikzset{gas filled surge arrester choice = european}
+    \ctikzset{gas filled surge arrester choice = european}
 }
 
 \DeclareOption{siunitx}{
-	\pgf@circ@siunitxtrue
+    \pgf@circ@siunitxtrue
 }
 
 \DeclareOption{nosiunitx}{
-	\pgf@circ@siunitxfalse
+    \pgf@circ@siunitxfalse
 }
 
 \DeclareOption{fulldiode}{
-	\ctikzset{diode = full}
+    \ctikzset{diode = full}
 }
 
 \DeclareOption{emptydiode}{
-	\ctikzset{diode = empty}
+    \ctikzset{diode = empty}
 }
 
 \DeclareOption{strokediode}{
-	\ctikzset{diode = stroke}
+    \ctikzset{diode = stroke}
 }
 
 \DeclareOption{arrowmos}{
-	\pgf@circuit@mos@arrowstrue
+    \pgf@circuit@mos@arrowstrue
 }
 
 \DeclareOption{noarrowmos}{
-	\pgf@circuit@mos@arrowsfalse
+    \pgf@circuit@mos@arrowsfalse
 }
 
 \DeclareOption{fetbodydiode}{
-	\pgf@circuit@fet@bodydiodetrue
+    \pgf@circuit@fet@bodydiodetrue
 }
 
 \DeclareOption{nofetbodydiode}{
-	\pgf@circuit@fet@bodydiodefalse
+    \pgf@circuit@fet@bodydiodefalse
 }
 
 \DeclareOption{fetsolderdot}{
-	\pgf@circuit@fet@solderdottrue
+    \pgf@circuit@fet@solderdottrue
 }
 
 \DeclareOption{nofetsolderdot}{
-	\pgf@circuit@fet@solderdotfalse
+    \pgf@circuit@fet@solderdotfalse
 }
 
 \DeclareOption{emptypmoscircle}{
-	\pgf@circuit@pmos@emptycircletrue
+    \pgf@circuit@pmos@emptycircletrue
 }
 
 
 \DeclareOption{lazymos}{
-	\ctikzset{tripoles/nmos/width=.5}
-	\ctikzset{tripoles/nmos/gate height=.35}
-	\ctikzset{tripoles/nmos/base height=.35}
-	\ctikzset{tripoles/nmos/height/.initial=1.2}
-	\ctikzset{tripoles/nmos/base width=.5}
-	\ctikzset{tripoles/nmos/gate width=.65}
-	
-	\ctikzset{tripoles/pmos/width=.5}
-	\ctikzset{tripoles/pmos/gate height=.35}
-	\ctikzset{tripoles/pmos/base height=.35}
-	\ctikzset{tripoles/pmos/height/.initial=1.2}
-	\ctikzset{tripoles/pmos/base width=.5}
-	\ctikzset{tripoles/pmos/gate width=.65}
-	
-	\pgf@circuit@pmos@emptycircletrue
+    \ctikzset{tripoles/nmos/width=.5}
+    \ctikzset{tripoles/nmos/gate height=.35}
+    \ctikzset{tripoles/nmos/base height=.35}
+    \ctikzset{tripoles/nmos/height/.initial=1.2}
+    \ctikzset{tripoles/nmos/base width=.5}
+    \ctikzset{tripoles/nmos/gate width=.65}
+
+    \ctikzset{tripoles/pmos/width=.5}
+    \ctikzset{tripoles/pmos/gate height=.35}
+    \ctikzset{tripoles/pmos/base height=.35}
+    \ctikzset{tripoles/pmos/height/.initial=1.2}
+    \ctikzset{tripoles/pmos/base width=.5}
+    \ctikzset{tripoles/pmos/gate width=.65}
+
+    \pgf@circuit@pmos@emptycircletrue
 }
 
 \DeclareOption{straightlabels}{
-	\ctikzset{label/align = straight}
+    \ctikzset{label/align = straight}
 }
 
 \DeclareOption{rotatelabels}{
-	\ctikzset{label/align = rotate}
+    \ctikzset{label/align = rotate}
 }
 
 \DeclareOption{smartlabels}{
-	\ctikzset{label/align = smart}
+    \ctikzset{label/align = smart}
 }
 
 \DeclareOption{compatibility}{
-	\pgf@circuit@compattrue
+    \pgf@circuit@compattrue
 }
 
 \DeclareOption{oldvoltagedirection}{
-	\pgf@circ@oldvoltagedirectiontrue
+    \pgf@circ@oldvoltagedirectiontrue
+    \pgf@circ@explicitvdirtrue
+    \pgf@circ@fixbatteriesfalse
 }
 \DeclareOption{nooldvoltagedirection}{
-	\pgf@circ@oldvoltagedirectionfalse
+    \pgf@circ@oldvoltagedirectionfalse
+    \pgf@circ@explicitvdirtrue
+    \pgf@circ@fixbatteriesfalse
 }
 
-\DeclareOption{betterproportions}{
-	\ctikzset{monopoles/ground/width/.initial=.15}
-
-	\ctikzset{bipoles/resistor/height/.initial=.23}
-	\ctikzset{bipoles/resistor/width/.initial=.6}
-	\ctikzset{bipoles/capacitor/height/.initial=.4}
-	\ctikzset{bipoles/capacitor/width/.initial=.1}
-	\ctikzset{bipoles/potentiometer/height/.initial=.6}
-	\ctikzset{bipoles/potentiometer/height 2/.initial=.23}
-	\ctikzset{bipoles/potentiometer/width/.initial=.6}
-	\ctikzset{bipoles/photoresistor/height/.initial=.6}
-	\ctikzset{bipoles/photoresistor/height 2/.initial=.23}
-	\ctikzset{bipoles/photoresistor/width/.initial=.6}
-	\ctikzset{bipoles/thermistor/main/.initial=.7}
-	\ctikzset{bipoles/thermistor/height/.initial=.328}%.23/.7
-	\ctikzset{bipoles/thermistor/width/.initial=.6}
-	\ctikzset{bipoles/thermistorntc/width/.initial=.6}
-	\ctikzset{bipoles/thermistorntc/main/.initial=.7}
-	\ctikzset{bipoles/thermistorntc/height/.initial=.328}%.23/.7
-	\ctikzset{bipoles/thermistorntc/height 2/.initial=.75}%.23/.7
-	\ctikzset{bipoles/thermistorptc/width/.initial=.6}
-	\ctikzset{bipoles/thermistorptc/main/.initial=.7}
-	\ctikzset{bipoles/thermistorptc/height/.initial=.328}%.23/.7
-	\ctikzset{bipoles/varistor/main/.initial=.7}
-	\ctikzset{bipoles/varistor/height/.initial=.328}%.23/.7
-	\ctikzset{bipoles/varistor/width/.initial=.6}
-	\ctikzset{bipoles/vresistor/height/.initial=.45}
-	\ctikzset{bipoles/vresistor/width/.initial=.6}
-	\ctikzset{bipoles/generic/height/.initial=.23}
-	\ctikzset{bipoles/generic/width/.initial=.6}
-	\ctikzset{bipoles/generic potentiometer/height/.initial=.6}
-	\ctikzset{bipoles/generic potentiometer/height 2/.initial=.23}
-	\ctikzset{bipoles/generic potentiometer/width/.initial=.6}
-	\ctikzset{bipoles/ageneric/height/.initial=.23}
-	\ctikzset{bipoles/ageneric/width/.initial=.6}
-	\ctikzset{bipoles/memristor/height/.initial=.23}
-	\ctikzset{bipoles/memristor/wave height/.initial=.375}
-	\ctikzset{bipoles/memristor/width/.initial=.60}
-	\ctikzset{bipoles/tgeneric/height/.initial=.525}
-	\ctikzset{bipoles/tgeneric/width/.initial=.6}
-	\ctikzset{bipoles/tfullgeneric/height/.initial=.525}
-	\ctikzset{bipoles/tfullgeneric/width/.initial=.60}
-	\ctikzset{bipoles/fullgeneric/height/.initial=.23}
-	\ctikzset{bipoles/fullgeneric/width/.initial=.6}
-	\ctikzset{bipoles/diode/height/.initial=.3}
-	\ctikzset{bipoles/diode/width/.initial=.25}
-	
-	\ctikzset{tripoles/thyristor/height/.initial=.66}
-	\ctikzset{tripoles/thyristor/height 2/.initial=.3}
-	\ctikzset{tripoles/thyristor/width/.initial=.6}
-	\ctikzset{tripoles/thyristor/diode height/.initial=.3}
-	\ctikzset{tripoles/thyristor/diode width left/.initial=.4}
-	\ctikzset{tripoles/thyristor/diode width right/.initial=.3}
-
-	\ctikzset{tripoles/triac/height/.initial=.66}
-	\ctikzset{tripoles/triac/width/.initial=.6}
-	\ctikzset{tripoles/triac/diode width left/.initial=.3}
-	\ctikzset{tripoles/triac/diode width right/.initial=.3}
+\DeclareOption{RPvoltages}{
+    \pgf@circ@oldvoltagedirectiontrue
+    \pgf@circ@explicitvdirtrue
+    \pgf@circ@fixbatteriestrue
+}
+\DeclareOption{EFvoltages}{
+    \pgf@circ@oldvoltagedirectionfalse
+    \pgf@circ@explicitvdirtrue
+    \pgf@circ@fixbatteriestrue
 }
 
+
+\DeclareOption{betterproportions}{
+    \ctikzset{monopoles/ground/width/.initial=.15}
+
+    \ctikzset{bipoles/resistor/height/.initial=.23}
+    \ctikzset{bipoles/resistor/width/.initial=.6}
+    \ctikzset{bipoles/capacitor/height/.initial=.4}
+    \ctikzset{bipoles/capacitor/width/.initial=.1}
+    \ctikzset{bipoles/potentiometer/height/.initial=.6}
+    \ctikzset{bipoles/potentiometer/height 2/.initial=.23}
+    \ctikzset{bipoles/potentiometer/width/.initial=.6}
+    \ctikzset{bipoles/photoresistor/height/.initial=.6}
+    \ctikzset{bipoles/photoresistor/height 2/.initial=.23}
+    \ctikzset{bipoles/photoresistor/width/.initial=.6}
+    \ctikzset{bipoles/thermistor/main/.initial=.7}
+    \ctikzset{bipoles/thermistor/height/.initial=.328}%.23/.7
+    \ctikzset{bipoles/thermistor/width/.initial=.6}
+    \ctikzset{bipoles/thermistorntc/width/.initial=.6}
+    \ctikzset{bipoles/thermistorntc/main/.initial=.7}
+    \ctikzset{bipoles/thermistorntc/height/.initial=.328}%.23/.7
+    \ctikzset{bipoles/thermistorntc/height 2/.initial=.75}%.23/.7
+    \ctikzset{bipoles/thermistorptc/width/.initial=.6}
+    \ctikzset{bipoles/thermistorptc/main/.initial=.7}
+    \ctikzset{bipoles/thermistorptc/height/.initial=.328}%.23/.7
+    \ctikzset{bipoles/varistor/main/.initial=.7}
+    \ctikzset{bipoles/varistor/height/.initial=.328}%.23/.7
+    \ctikzset{bipoles/varistor/width/.initial=.6}
+    \ctikzset{bipoles/vresistor/height/.initial=.45}
+    \ctikzset{bipoles/vresistor/width/.initial=.6}
+    \ctikzset{bipoles/generic/height/.initial=.23}
+    \ctikzset{bipoles/generic/width/.initial=.6}
+    \ctikzset{bipoles/generic potentiometer/height/.initial=.6}
+    \ctikzset{bipoles/generic potentiometer/height 2/.initial=.23}
+    \ctikzset{bipoles/generic potentiometer/width/.initial=.6}
+    \ctikzset{bipoles/ageneric/height/.initial=.23}
+    \ctikzset{bipoles/ageneric/width/.initial=.6}
+    \ctikzset{bipoles/memristor/height/.initial=.23}
+    \ctikzset{bipoles/memristor/wave height/.initial=.375}
+    \ctikzset{bipoles/memristor/width/.initial=.60}
+    \ctikzset{bipoles/tgeneric/height/.initial=.525}
+    \ctikzset{bipoles/tgeneric/width/.initial=.6}
+    \ctikzset{bipoles/tfullgeneric/height/.initial=.525}
+    \ctikzset{bipoles/tfullgeneric/width/.initial=.60}
+    \ctikzset{bipoles/fullgeneric/height/.initial=.23}
+    \ctikzset{bipoles/fullgeneric/width/.initial=.6}
+    \ctikzset{bipoles/diode/height/.initial=.3}
+    \ctikzset{bipoles/diode/width/.initial=.25}
+    \ctikzset{bipoles/bidirectionaldiode/height/.initial=.66}
+    \ctikzset{bipoles/bidirectionaldiode/width/.initial=.6}
+    \ctikzset{bipoles/bidirectionaldiode/diode width left/.initial=.3}
+    \ctikzset{bipoles/bidirectionaldiode/diode width right/.initial=.3}
+
+    \ctikzset{tripoles/thyristor/height/.initial=.66}
+    \ctikzset{tripoles/thyristor/height 2/.initial=.3}
+    \ctikzset{tripoles/thyristor/width/.initial=.6}
+    \ctikzset{tripoles/thyristor/diode height/.initial=.3}
+    \ctikzset{tripoles/thyristor/diode width left/.initial=.4}
+    \ctikzset{tripoles/thyristor/diode width right/.initial=.3}
+
+    \ctikzset{tripoles/triac/height/.initial=.66}
+    \ctikzset{tripoles/triac/width/.initial=.6}
+    \ctikzset{tripoles/triac/diode width left/.initial=.3}
+    \ctikzset{tripoles/triac/diode width right/.initial=.3}
+}
+
+% This is a nice hack that prints all the shapes declared
+% by the package. Very useful for coverage testing and debugging.
+%
+% \let\origpgfdeclareshape=\pgfdeclareshape
+% \def\pgfdeclareshape#1{%
+%     \typeout{SHAPE:\space"#1"}%
+%     \origpgfdeclareshape{#1}
+% }
+
+
 %%%%%%%%%
 \input pgfcirc.defines.tex
 \input pgfcircutils.tex
@@ -307,13 +341,15 @@
 \input pgfcircbipoles.tex
 \input pgfcirctripoles.tex
 \input pgfcircquadpoles.tex
+\input pgfcircmultipoles.tex
 
 \input pgfcirclabel.tex
 \input pgfcircvoltage.tex
 \input pgfcirccurrent.tex
 \input pgfcircflow.tex
 
-\ExecuteOptions{nofetbodydiode,nofetsolderdot,nooldvoltagedirection,europeancurrents,europeanvoltages,americanports,americanresistors,cuteinductors,europeangfsurgearrester,nosiunitx,noarrowmos,smartlabels,nocompatibility}
+% notice that the default is nooldvoltagedirections; it's not explicitly set to allow for the warning
+\ExecuteOptions{nofetbodydiode, nofetsolderdot, europeancurrents, europeanvoltages,americanports, americanresistors, cuteinductors ,europeangfsurgearrester, nosiunitx, noarrowmos, smartlabels, nocompatibility}
 
 \ProcessOptions\relax
 
@@ -321,11 +357,19 @@
 
 \ifpgf@circ@siunitx
     \RequirePackage{xstring}[2009/03/13]
-	%\expandafter\let\csname angstrom\endcsname\relax
-	\RequirePackage{siunitx}
+    %\expandafter\let\csname angstrom\endcsname\relax
+    \RequirePackage{siunitx}
 \fi
 
-
+\ifpgf@circ@explicitvdir\else
+    \PackageWarningNoLine{circuitikz}{%
+        You did not specify one of the voltage directions:\MessageBreak
+        \space\space    oldvoltagedirections, nooldvoltagedirections, \MessageBreak
+        \space\space    RPvoltages or EFvoltages \MessageBreak
+        Default directions may have changed, \MessageBreak
+        please check the manual%
+    }
+\fi
 
 \newenvironment{circuitikz}{\begin{tikzpicture}}{\end{tikzpicture}}
 %override (unused) circuitikz environment for compability to externalization)