circuitikz (24apr16)

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

11 files changed, 1565 insertions, 1319 deletions

diff --git a/Master/texmf-dist/tex/generic/circuitikz/circuitikz.code.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
index 4dfe979f86b..dabfbcbdb27 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/circuitikz.code.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex
@@ -17,15 +17,34 @@
 \def\ctikzvalof#1{\pgfkeysvalueof{\circuitikzbasekey/#1}}
 \def\ctikzsetvalof#1#2{\pgfkeyssetvalue{\circuitikzbasekey/#1}{#2}}
 
-
 \newif\ifpgf@circ@siunitx
 \newif\ifpgf@circuit@compat
+\newif\ifpgf@circ@oldvoltagedirection
 
+% Option ">" for twoports
 \newif\ifpgf@circuit@inputarrow
+\ctikzset{>/.add code={}{\pgf@circuit@inputarrowtrue}}
 \ctikzset{inputarrow/.is choice}
 \ctikzset{inputarrow/true/.code={\pgf@circuit@inputarrowtrue}}
 \ctikzset{inputarrow/false/.code={\pgf@circuit@inputarrowfalse}}
 
+% Option "boxed" for nodes and twoports
+\newif\ifpgf@circuit@boxed
+\pgfkeys{/tikz/boxed/.add code={}{\pgf@circuit@boxedtrue}}
+\ctikzset{boxed/.add code={}{\pgf@circuit@boxedtrue}}
+\pgfkeys{/tikz/box/.add code={}{\pgf@circuit@boxedtrue}}
+\ctikzset{box/.add code={}{\pgf@circuit@boxedtrue}}
+
+% Option "dashed" for nodes and twoports
+\newif\ifpgf@circuit@dashed
+\pgfkeys{/tikz/dashed/.add code={}{\pgf@circuit@dashedtrue}}
+\ctikzset{dashed/.add code={}{\pgf@circuit@dashedtrue}}
+
+% Option "t=*" for nodes
+\pgfkeys{/tikz/t/.add code={}{\ctikzset{text=#1}}}
+
+
+
 \ctikzset{bipoles/.is family}
 \ctikzset{bipoles/border margin/.initial=1.1}
 \ctikzset{bipoles/thickness/.initial=2} 
@@ -39,7 +58,6 @@
 \ctikzset{monopoles/tground/thickness/.initial=3}
 \ctikzset{monopoles/vcc/width/.initial=.2}
 \ctikzset{monopoles/match/width/.initial=.4}
-\ctikzset{monopoles/oscillator/width/.initial=.7}
 \ctikzset{monopoles/chassis/width/.initial=.25}
 \ctikzset{monopoles/alternative chassis/width/.initial=.25}
 \ctikzset{monopoles/equipotentiality/width/.initial=.25}
@@ -102,6 +120,8 @@
 \ctikzset{bipoles/vamericaninductor/coil height/.initial=.15}
 \ctikzset{bipoles/esource/height/.initial=.60}
 \ctikzset{bipoles/esource/width/.initial=.60}
+\ctikzset{bipoles/pvsource/height/.initial=.60}
+\ctikzset{bipoles/pvsource/width/.initial=.60}
 \ctikzset{bipoles/isource/height/.initial=.60}
 \ctikzset{bipoles/isource/width/.initial=.60}
 \ctikzset{bipoles/dcisource/height/.initial=.60}
@@ -138,12 +158,17 @@
 \ctikzset{bipoles/cvsourcesin/width/.initial=.7}
 \ctikzset{bipoles/capacitor/height/.initial=.6}
 \ctikzset{bipoles/capacitor/width/.initial=.2}
+\ctikzset{bipoles/ecapacitor/height/.initial=.5}
+\ctikzset{bipoles/ecapacitor/width/.initial=.2}
+\ctikzset{bipoles/ecapacitor/font/.initial= \fontsize{6}{0}\selectfont\boldmath}
 \ctikzset{bipoles/pcapacitor/height/.initial=.6}
 \ctikzset{bipoles/pcapacitor/width/.initial=.2}
 \ctikzset{bipoles/pcapacitor/bend width/.initial=1.1}
 \ctikzset{bipoles/vcapacitor/height/.initial=.6}
 \ctikzset{bipoles/vcapacitor/width/.initial=.5}
 \ctikzset{bipoles/vcapacitor/capacitor width/.initial=.4}
+\ctikzset{bipoles/piezoelectric/height/.initial=.7}
+\ctikzset{bipoles/piezoelectric/width/.initial=.5}
 \ctikzset{bipoles/battery/height/.initial=.6}
 \ctikzset{bipoles/battery/width/.initial=.3}
 \ctikzset{bipoles/battery1/height/.initial=.6}
@@ -237,18 +262,77 @@
 \ctikzset{tripoles/mos style/.is choice}
 \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 
+\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 
+\newif\ifpgf@circuit@fet@bodydiode
+\pgfkeys{/tikz/bodydiode/.add code={}{\pgf@circuit@fet@bodydiodetrue}}
+\ctikzset{bodydiode/.add code={}{\pgf@circuit@fet@bodydiodetrue}}
+\pgfkeys{/tikz/nobodydiode/.add code={}{\pgf@circuit@fet@bodydiodefalse}}
+\ctikzset{nobodydiode/.add code={}{\pgf@circuit@fet@bodydiodefalse}}
+
+% Option draw fet without gate connection
+\newif\ifpgf@circuit@bpt@drawgate
+\pgf@circuit@bpt@drawgatetrue
+\pgfkeys{/tikz/nogate/.add code={}{\pgf@circuit@bpt@drawgatefalse}}
+\ctikzset{nogate/.add code={}{\pgf@circuit@bpt@drawgatefalse}}
+\pgfkeys{/tikz/nobase/.add code={}{\pgf@circuit@bpt@drawgatefalse}}
+\ctikzset{nobase/.add code={}{\pgf@circuit@bpt@drawgatefalse}}
+
+% Option draw bpt without base connection
+\newif\ifpgf@circuit@bpt@drawbase
+\pgf@circuit@bpt@drawbasetrue
+\pgfkeys{/tikz/nobase/.add code={}{\pgf@circuit@bpt@drawbasefalse}}
+\ctikzset{nobase/.add code={}{\pgf@circuit@bpt@drawbasefalse}}
+\pgfkeys{/tikz/nogate/.add code={}{\pgf@circuit@bpt@drawbasefalse}}
+\ctikzset{nogate/.add code={}{\pgf@circuit@bpt@drawbasefalse}}
+
+% Option draw bpt with optical input
+\newif\ifpgf@circuit@bpt@drawphoto
+\pgf@circuit@bpt@drawphotofalse
+\pgfkeys{/tikz/photo/.add code={}{\pgf@circuit@bpt@drawphototrue}}
+\ctikzset{photo/.add code={}{\pgf@circuit@bpt@drawphototrue}}
+\pgfkeys{/tikz/photo/.add code={}{\pgf@circuit@bpt@drawphototrue}}
+\ctikzset{photo/.add code={}{\pgf@circuit@bpt@drawphototrue}}
+
+% Option draw pmos with empty circle
+\newif\ifpgf@circuit@pmos@emptycircle
+\newif\ifpgf@circuit@pmos@emptycircle
+\pgf@circuit@pmos@emptycirclefalse
+\pgfkeys{/tikz/emptycircle/.add code={}{\pgf@circuit@pmos@emptycircletrue}}
+\ctikzset{tripoles/pmos style/emptycircle/.add code={}{\pgf@circuit@pmos@emptycircletrue}}
+
+
+\newif\ifpgf@circuit@fet@ntype
+\pgf@circuit@fet@ntypetrue %default true
+%\newif\ifpgf@circuit@fet@ptype
+%\ctikzset{tripoles/nmos/.add code={\pgf@circuit@fet@ntypetrue}}
 \ctikzset{tripoles/nmos/width/.initial=.7}
 \ctikzset{tripoles/nmos/gate height/.initial=.35}
 \ctikzset{tripoles/nmos/base height/.initial=.5}
 \ctikzset{tripoles/nmos/height/.initial=1.1}
 \ctikzset{tripoles/nmos/base width/.initial=.5}
 \ctikzset{tripoles/nmos/gate width/.initial=.62}
+\ctikzset{tripoles/nmos/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/nmos/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/nmos/bodydiode conn/.initial=.6}
+
 \ctikzset{tripoles/pmos/width/.initial=.7}
 \ctikzset{tripoles/pmos/gate height/.initial=.35}
 \ctikzset{tripoles/pmos/base height/.initial=.5}
 \ctikzset{tripoles/pmos/height/.initial=1.1}
 \ctikzset{tripoles/pmos/base width/.initial=.5}
 \ctikzset{tripoles/pmos/gate width/.initial=.62}
+\ctikzset{tripoles/pmos/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pmos/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pmos/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/nfet/width/.initial=.7}
 \ctikzset{tripoles/nfet/gate height/.initial=.35}
@@ -256,6 +340,10 @@
 \ctikzset{tripoles/nfet/height/.initial=1.1}
 \ctikzset{tripoles/nfet/base width/.initial=.5}
 \ctikzset{tripoles/nfet/gate width/.initial=.62}
+\ctikzset{tripoles/nfet/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/nfet/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/nfet/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/pfet/width/.initial=.7}
 \ctikzset{tripoles/pfet/gate height/.initial=.35}
@@ -263,6 +351,10 @@
 \ctikzset{tripoles/pfet/height/.initial=1.1}
 \ctikzset{tripoles/pfet/base width/.initial=.5}
 \ctikzset{tripoles/pfet/gate width/.initial=.62}
+\ctikzset{tripoles/pfet/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pfet/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pfet/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/nigfete/width/.initial=.7}
 \ctikzset{tripoles/nigfete/gate height/.initial=.35}
@@ -270,6 +362,9 @@
 \ctikzset{tripoles/nigfete/height/.initial=1.1}
 \ctikzset{tripoles/nigfete/base width/.initial=.5}
 \ctikzset{tripoles/nigfete/gate width/.initial=.62}
+\ctikzset{tripoles/nigfete/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/nigfete/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/nigfete/bodydiode conn/.initial=.6}
 
 \ctikzset{tripoles/nigfetd/width/.initial=.7}
 \ctikzset{tripoles/nigfetd/gate height/.initial=.35}
@@ -277,6 +372,10 @@
 \ctikzset{tripoles/nigfetd/height/.initial=1.1}
 \ctikzset{tripoles/nigfetd/base width/.initial=.5}
 \ctikzset{tripoles/nigfetd/gate width/.initial=.62}
+\ctikzset{tripoles/nigfetd/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/nigfetd/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/nigfetd/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/nigfetebulk/width/.initial=.7}
 \ctikzset{tripoles/nigfetebulk/gate height/.initial=.35}
@@ -284,6 +383,10 @@
 \ctikzset{tripoles/nigfetebulk/height/.initial=1.1}
 \ctikzset{tripoles/nigfetebulk/base width/.initial=.5}
 \ctikzset{tripoles/nigfetebulk/gate width/.initial=.62}
+\ctikzset{tripoles/nigfetebulk/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/nigfetebulk/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/nigfetebulk/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/pigfete/width/.initial=.7}
 \ctikzset{tripoles/pigfete/gate height/.initial=.35}
@@ -291,6 +394,10 @@
 \ctikzset{tripoles/pigfete/height/.initial=1.1}
 \ctikzset{tripoles/pigfete/base width/.initial=.5}
 \ctikzset{tripoles/pigfete/gate width/.initial=.62}
+\ctikzset{tripoles/pigfete/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pigfete/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pigfete/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/pigfetd/width/.initial=.7}
 \ctikzset{tripoles/pigfetd/gate height/.initial=.35}
@@ -298,6 +405,10 @@
 \ctikzset{tripoles/pigfetd/height/.initial=1.1}
 \ctikzset{tripoles/pigfetd/base width/.initial=.5}
 \ctikzset{tripoles/pigfetd/gate width/.initial=.62}
+\ctikzset{tripoles/pigfetd/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pigfetd/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pigfetd/bodydiode conn/.initial=.6}
+
 
 \ctikzset{tripoles/pigfetebulk/width/.initial=.7}
 \ctikzset{tripoles/pigfetebulk/gate height/.initial=.35}
@@ -305,22 +416,23 @@
 \ctikzset{tripoles/pigfetebulk/height/.initial=1.1}
 \ctikzset{tripoles/pigfetebulk/base width/.initial=.5}
 \ctikzset{tripoles/pigfetebulk/gate width/.initial=.62}
+\ctikzset{tripoles/pigfetebulk/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pigfetebulk/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pigfetebulk/bodydiode conn/.initial=.6}
 
 \ctikzset{tripoles/npn/width/.initial=.6}
-\ctikzset{tripoles/npn/gate height/.initial=.45}
-\ctikzset{tripoles/npn/gate height 2/.initial=.15}
+\ctikzset{tripoles/npn/base height/.initial=.45}
+\ctikzset{tripoles/npn/base height 2/.initial=.15}
 \ctikzset{tripoles/npn/base height/.initial=.4}
 \ctikzset{tripoles/npn/height/.initial=1.1}
-\ctikzset{tripoles/npn/gate width/.initial=.5}
-
-
+\ctikzset{tripoles/npn/base width/.initial=.5}
 
 \ctikzset{tripoles/pnp/width/.initial=.6}
-\ctikzset{tripoles/pnp/gate height/.initial=.45}
-\ctikzset{tripoles/pnp/gate height 2/.initial=.15}
+\ctikzset{tripoles/pnp/base height/.initial=.45}
+\ctikzset{tripoles/pnp/base height 2/.initial=.15}
 \ctikzset{tripoles/pnp/base height/.initial=.4}
 \ctikzset{tripoles/pnp/height/.initial=1.1}
-\ctikzset{tripoles/pnp/gate width/.initial=.5}
+\ctikzset{tripoles/pnp/base width/.initial=.5}
 
 \ctikzset{tripoles/pigbt/width/.initial=.6}
 \ctikzset{tripoles/pigbt/gate height/.initial=.45}
@@ -342,11 +454,18 @@
 \ctikzset{tripoles/njfet/gate height 2/.initial=.35}
 \ctikzset{tripoles/njfet/gate width/.initial=.5}
 \ctikzset{tripoles/njfet/height/.initial=1.1}
+\ctikzset{tripoles/njfet/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/njfet/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/njfet/bodydiode conn/.initial=.6}
+
 \ctikzset{tripoles/pjfet/width/.initial=.7}
 \ctikzset{tripoles/pjfet/gate height/.initial=.5}
 \ctikzset{tripoles/pjfet/gate height 2/.initial=.35}
 \ctikzset{tripoles/pjfet/gate width/.initial=.5}
 \ctikzset{tripoles/pjfet/height/.initial=1.1}
+\ctikzset{tripoles/pjfet/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/pjfet/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/pjfet/bodydiode conn/.initial=.6}
 
 \ctikzset{tripoles/isfet/width/.initial=1}
 \ctikzset{tripoles/isfet/gate height/.initial=.35}
@@ -358,6 +477,9 @@
 \ctikzset{tripoles/isfet/wave amp/.initial=.06}
 \ctikzset{tripoles/isfet/waves y sep/.initial=.22}
 \ctikzset{tripoles/isfet/waves x sep/.initial=.8}
+\ctikzset{tripoles/isfet/bodydiode scale/.initial=.3}
+\ctikzset{tripoles/isfet/bodydiode distance/.initial=.3}
+\ctikzset{tripoles/isfet/bodydiode conn/.initial=.6}
 
 \newif\ifpgf@circuit@europeanlogicport
 \ctikzset{logic ports/.is choice}
@@ -459,7 +581,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=}
+\ctikzset{tripoles/op amp/font/.initial= \fontsize{10}{0}\selectfont\boldmath}%absolut font size needed!
 \ctikzset{tripoles/gm amp/width/.initial=1.7}
 \ctikzset{tripoles/gm amp/port width/.initial=.7}
 \ctikzset{tripoles/gm amp/height/.initial=1.4}
@@ -494,6 +616,8 @@
 \ctikzset{tripoles/mixer/width/.initial=0.7}
 \ctikzset{tripoles/adder/width/.initial=0.7}
 \ctikzset{tripoles/circulator/width/.initial=.7}
+\ctikzset{tripoles/oscillator/width/.initial=.7}
+
 
 \ctikzset{tripoles/wilkinson/height/.initial=1.3}
 \ctikzset{tripoles/wilkinson/width/.initial=1.3}
@@ -508,10 +632,17 @@
 \ctikzset{quadpoles/transformer core/core width/.initial=.05}
 \ctikzset{quadpoles/gyrator/width/.initial=1.5}
 \ctikzset{quadpoles/gyrator/height/.initial=1.5}
+\ctikzset{quadpoles/fourport/width/.initial=1.3}
+\ctikzset{quadpoles/fourport/height/.initial=1.3}
 \ctikzset{quadpoles/coupler/width/.initial=1.3}
 \ctikzset{quadpoles/coupler/height/.initial=1.3}
+\ctikzset{quadpoles/coupler2/width/.initial=1.3}
+\ctikzset{quadpoles/coupler2/height/.initial=1.3}
 
 
+\ctikzset{/tikz/circuitikz/tripoles/elmech/height/.initial=.8}
+\ctikzset{/tikz/circuitikz/tripoles/elmech/width/.initial=.6}
+
 
 \ctikzset{bipole/.is family}
 \ctikzset{bipole/kind/.initial = }
@@ -677,19 +808,11 @@
 \ctikzset{label/align/straight/.code={\ctikzsetvalof{label/align}{straight}}}
 \ctikzset{label/align/rotate/.code={\ctikzsetvalof{label/align}{rotate}}}
 \ctikzset{label/align/smart/.code={\ctikzsetvalof{label/align}{smart}}}
-%% dependencies
-
-
-
-
-
 
 %%%%%%%%%% new
 \pgfkeys{\circuitikzbasekey/.search also={/tikz}}
 
 
-
-
 \input pgfcircutils.tex
 \input pgfcircmath.tex
 
@@ -698,13 +821,8 @@
 \input pgfcircbipoles.tex
 \input pgfcirctripoles.tex
 \input pgfcircquadpoles.tex
-\input pgfcircnpoles.tex
 
 \input pgfcirclabel.tex
 \input pgfcircvoltage.tex
 \input pgfcirccurrent.tex
-\input pgfcircinputarrows.tex
-
-
-
 
diff --git a/Master/texmf-dist/tex/generic/circuitikz/circuitikz1.code.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbasic.tex
index 3319bc18c1f..f6ff09e521d 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/circuitikz1.code.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbasic.tex
@@ -73,8 +73,13 @@
 			(\ctikzvalof{bipole/name}) {}
 	\ifx\pgf@temp\pgf@circ@temp  % if it is an open
 	\else
-		(\ctikzvalof{bipole/name}start.center) -- (\ctikzvalof{bipole/name}.left) 
-		(\ctikzvalof{bipole/name}.right)  -- (\ctikzvalof{bipole/name}end.center) 
+		\ifdefined\pgf@anchor@#1@pathstart% 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
 	\fi
 	\pgf@circ@ifkeyempty{bipole/label/name}\else\pgf@circ@drawlabel\fi
 	\drawpoles
@@ -98,8 +103,10 @@
 \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@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}}
+\def\pgf@circ@piezoelectric@path#1{\pgf@circ@bipole@path{piezoelectric}{#1}}
 \def\pgf@circ@battery@path#1{\pgf@circ@bipole@path{battery}{#1}}
 \def\pgf@circ@battery1@path#1{\pgf@circ@bipole@path{battery1}{#1}}
 \def\pgf@circ@europeaninductor@path#1{\pgf@circ@bipole@path{fullgeneric}{#1}}
@@ -142,6 +149,7 @@
 \def\pgf@circ@vcuteinductor@path#1{\pgf@circ@bipole@path{vcuteinductor}{#1}}
 \def\pgf@circ@lamp@path#1{\pgf@circ@bipole@path{lamp}{#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}}
 \def\pgf@circ@dcvsource@path#1{\pgf@circ@bipole@path{dcvsource}{#1}}
 \def\pgf@circ@vsourceam@path#1{\pgf@circ@bipole@path{vsourceAM}{#1}}
@@ -222,7 +230,6 @@
 \def\pgf@circ@vphaseshifter@path#1{\pgf@circ@bipole@path{vphaseshifter}{#1}}
 \def\pgf@circ@detector@path#1{\pgf@circ@bipole@path{detector}{#1}}
 
-
 %% Styles
 
 %% Aggiungere per thyristor e tripoli semplici
@@ -249,8 +256,11 @@
 \compattikzset{variable american resistor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@bipole@path{vresistor}{#1}, l=#1}}
 \compattikzset{variable european resistor/.style= {\circuitikzbasekey, /tikz/to path=\pgf@circ@bipole@path{tgeneric}{#1}, l=#1}}
 \compattikzset{capacitor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@capacitor@path, l=#1}}
+\compattikzset{elko/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ecapacitor@path, l=#1}}
+\compattikzset{ecapacitor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@ecapacitor@path, l=#1}}
 \compattikzset{polar capacitor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@polarcapacitor@path, l=#1}}
 \compattikzset{variable capacitor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@vcapacitor@path, l=#1}}
+\compattikzset{piezoelectric/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@piezoelectric@path, l=#1}}
 \compattikzset{battery/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@battery@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
 \compattikzset{battery1/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@battery1@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
 \compattikzset{inductor/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@inductor@path, l=#1}}
@@ -367,10 +377,11 @@
 
 % short forms
 \compattikzset{esource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@esource@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
+\compattikzset{pvsource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@pvsource@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
 \compattikzset{dcvsource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@dcvsource@path, \circuitikzbasekey/bipole/is voltage=true, v=#1}}
-\compattikzset{dcisource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@dcisource@path, l=#1}}
-\compattikzset{myvsource/.style = {\comnpatname dcvsource = #1}}%For compability, not documented, can be removed in further versions
-\compattikzset{myisource/.style = {\comnpatname dcisource = #1}}%For compability, not documented, can be removed in further versions
+\compattikzset{dcisource/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@dcisource@path, \circuitikzbasekey/bipole/is current=true, i=#1}}
+
+
 \compattikzset{vsource/.style = {\comnpatname voltage source = #1}}
 \compattikzset{isource/.style = {\comnpatname current source = #1}}
 \compattikzset{cisource/.style = {\comnpatname controlled current source = #1}}
@@ -396,14 +407,17 @@
 \compattikzset{thRn/.style= {\comnpatname thermistor ntc= #1}}
 \compattikzset{pR/.style= {\comnpatname potentiometer = #1}}
 \compattikzset{C/.style = {\comnpatname capacitor = #1}}
+\compattikzset{eC/.style = {\comnpatname ecapacitor = #1}}
 \compattikzset{pC/.style = {\comnpatname polar capacitor = #1}}
 \compattikzset{vC/.style = {\comnpatname variable capacitor = #1}}
+\compattikzset{PZ/.style = {\comnpatname piezoelectric = #1}}
 \compattikzset{L/.style = {\comnpatname inductor = #1}}
 \compattikzset{vL/.style = {\comnpatname variable inductor = #1}}
 \compattikzset{V/.style = {\comnpatname voltage source = #1}}
 \compattikzset{cV/.style = {\comnpatname controlled voltage source = #1}}
 \compattikzset{sV/.style = {\comnpatname sinusoidal voltage source = #1}}
 \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} } 
@@ -454,10 +468,12 @@
 
 \compattikzset{cspst/.style = {\comnpatname closing switch = #1}}
 \compattikzset{ospst/.style = {\comnpatname opening switch = #1}}
-\compattikzset{spst/.style = {switch = #1}}
+\compattikzset{spst/.style = {\comnpatname switch = #1}}
 
 \compattikzset{afuse/.style = {\comnpatname asymmetric fuse=#1}}
 
+\compattikzset{vdd/.style = {\comnpatname vcc = #1}}
+\compattikzset{vss/.style = {\comnpatname vee = #1}}
 
 \def\inheritlogicport#1#2{
 	\pgfdeclareshape{#2 port}{
@@ -515,10 +531,15 @@
 		\edef\pgf@circ@direction{\pgfmathresult}
 	}
 	($(\tikztostart) ! .5 ! (\tikztotarget)$) 
-		node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}] 
+		node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}]
 			(\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/label/name}}
-	(\ctikzvalof{bipole/name}start.center) -- (\ctikzvalof{bipole/name}.left) 
-	(\ctikzvalof{bipole/name}.right)  -- (\ctikzvalof{bipole/name}end.center) 
+	\@ifundefined{pgf@anchor@#1@pathstart}{%if special path-anchors are defined, use them!
+			(\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.left)
+			(\ctikzvalof{bipole/name}.right)  -- (\ctikzvalof{bipole/name}end.center)
+			}{
+			(\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.pathstart)
+			(\ctikzvalof{bipole/name}.pathend)  -- (\ctikzvalof{bipole/name}end.center)
+			}
 	\pgfextra{
 		\pgfcircresetpath
 	}  
@@ -530,6 +551,7 @@
 	\compattikzset{T#1/.style = {\circuitikzbasekey, /tikz/to path=\pgf@circ@trans@path{#1}{}, l=##1}}
 }
 
+\pgf@circ@definetranspath{elmech}
 \pgf@circ@definetranspath{nmos}
 \pgf@circ@definetranspath{pmos}
 \pgf@circ@definetranspath{npn}
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
index 8a1e62e29fc..8a7bd806ea1 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex
@@ -153,7 +153,7 @@
 	#1
 	
 	\backgroundpath{	
-		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
+		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}
 		
 		\northeast
 		\pgf@circ@res@up = \pgf@y 
@@ -277,6 +277,35 @@
 		
 }
 
+%% 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} $+$}	
+}
+
 %% Battery
 
 \pgfcircdeclarebipole{}{\ctikzvalof{bipoles/battery/height}}{battery}{\ctikzvalof{bipoles/battery/height}}{\ctikzvalof{bipoles/battery/width}}{
@@ -394,10 +423,18 @@
 
 	\pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}}
 
-	
-	\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]{$-$}
-
+	\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
+		\ifpgf@circuit@bipole@voltage@backward
+				\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
+	\fi
 	\pgfusepath{draw}
 }
 
@@ -490,6 +527,51 @@
 	\pgfusepath{draw}
 }
 
+%% 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}
+
+	%Adapted from battery1
+	\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}}
+
+	\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
+
+}
+
+%% 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}
+}
+
 %% 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}
@@ -503,8 +585,16 @@
 		\pgfpathlineto{\pgfpoint{.6\pgf@circ@res@right}{\pgf@circ@res@zero}}
 		\pgfusepath{draw}
 		\pgfscope
+		\ifpgf@circ@oldvoltagedirection
 			\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
-			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
+		\else
+			\ifpgf@circuit@bipole@current@backward
+				\pgftransformshift{\pgfpoint{-.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+				\pgftransformrotate{180}
+			\else
+				\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+		\fi\fi
+				\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
 		\endpgfscope
 }
 
@@ -549,7 +639,15 @@
 	\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}}
+		\ifpgf@circ@oldvoltagedirection
+			\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+		\else
+			\ifpgf@circuit@bipole@current@backward
+				\pgftransformshift{\pgfpoint{-.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+				\pgftransformrotate{180}
+			\else
+				\pgftransformshift{\pgfpoint{.5\pgf@circ@res@right}{\pgf@circ@res@zero}}
+		\fi\fi
 		\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
 	\endpgfscope
 }
@@ -1605,6 +1703,33 @@
 		\pgfusepath{draw}
 }
 
+
+%% Piezoelectric Element
+
+\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
+		\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}
+
+}
+
+
+
+
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Handling of terminals
 
@@ -1929,7 +2054,9 @@
 		\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}}
@@ -1969,6 +2096,9 @@
 		\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}
@@ -2016,6 +2146,10 @@
 		\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}}
@@ -2043,6 +2177,7 @@
 		
 		% 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}}
@@ -2081,6 +2216,10 @@
 		\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}}
@@ -2108,6 +2247,7 @@
 
 		% 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}}
@@ -2146,6 +2286,10 @@
 		\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}}
@@ -2173,6 +2317,7 @@
 
 		% 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}}
@@ -2211,6 +2356,10 @@
 		\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}}
@@ -2244,7 +2393,9 @@
 			\def\textii{D}
 		\fi\fi
 
-		% draw inner symbol					
+		% 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}}
@@ -2263,6 +2414,10 @@
 		\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}}
@@ -2296,7 +2451,9 @@
 			\def\textii{A}
 		\fi\fi
 
-		% draw inner symbol					
+		% 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}}
@@ -2314,6 +2471,10 @@
 		\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}
@@ -2352,6 +2513,10 @@
 		\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}
@@ -2384,36 +2549,35 @@
 
 %% Amplifier
 \pgfcircdeclarebipole{}{
-		%\ifpgf@circuit@box
+		\ifpgf@circuit@boxed
 			\ctikzvalof{bipoles/twoport/width}
-		%\else
-		%	\ctikzvalof{bipoles/amp/width}
-		%\fi
+		\else
+			\ctikzvalof{bipoles/amp/width}
+		\fi
 	}{amp}{
-		%\ifpgf@circuit@box
+		\ifpgf@circuit@boxed
 			\ctikzvalof{bipoles/twoport/width}
-		%\else
-		%	\ctikzvalof{bipoles/amp/width}
-	%	\fi
+		\else
+			\ctikzvalof{bipoles/amp/width}
+		\fi
 	}{
-	%	\ifpgf@circuit@box
+		\ifpgf@circuit@boxed
 			\ctikzvalof{bipoles/twoport/width}
-	%	\else
-	%		\ctikzvalof{bipoles/amp/width}
-	%	\fi
+		\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@box
-		%	\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
-		%\fi
-		% draw outer box
-		% 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@boxed
+			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}	
+			\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+		\fi
 		
 		% draw input arrow
 		\ifpgf@circuit@inputarrow
@@ -2423,31 +2587,62 @@
 				\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@left}{0.75\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.63\pgf@circ@res@right}{0}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.75\pgf@circ@res@down}}
+
+		\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}}
 }
 
 
 %% variable amplifier
-\pgfcircdeclarebipole{}{\ctikzvalof{bipoles/vamp/width}}{vamp}{\ctikzvalof{bipoles/vamp/width}}{\ctikzvalof{bipoles/vamp/width}}{
-		\pgf@circ@res@step = \ctikzvalof{bipoles/vamp/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 
+\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
 
-		% 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@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
@@ -2455,18 +2650,35 @@
 				\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@left}{0.75\pgf@circ@res@up}}
-		\pgfpathlineto{\pgfpoint{0.63\pgf@circ@res@right}{0}}
-		\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.75\pgf@circ@res@down}}
+
+		\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.75\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
-		\pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.7\pgf@circ@res@up}}
+		\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}
 }
 
@@ -2478,7 +2690,11 @@
 		\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}}
@@ -2503,6 +2719,7 @@
 
 		% 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}}
@@ -2524,6 +2741,10 @@
 		\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}}
@@ -2548,6 +2769,7 @@
 
 		% 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}}
@@ -2573,7 +2795,11 @@
 		\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}}
@@ -2598,6 +2824,7 @@
 
 		% 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}}
@@ -2616,6 +2843,10 @@
 		\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}}
@@ -2640,6 +2871,7 @@
 
 		% 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}}
@@ -2662,7 +2894,11 @@
 		\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}}
@@ -2700,7 +2936,11 @@
 		\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}}
@@ -2745,7 +2985,11 @@
 		\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}}
@@ -2760,6 +3004,8 @@
 		\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}}
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
index e559b5e2c5a..053149bfb19 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
@@ -99,10 +99,27 @@
 		\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
 }
 }
 
-\ctikzset{i</.style = { i = #1, \circuitikzbasekey/bipole/current/direction = backward } }
+
+\ifpgf@circ@oldvoltagedirection
+	\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 } }
+\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 } }
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircinputarrows.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircinputarrows.tex
deleted file mode 100644
index d710fb62d8a..00000000000
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircinputarrows.tex
+++ /dev/null
@@ -1,23 +0,0 @@
-% Copyright 2013 by Stefan Erhardt
-%
-% 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.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Show input arrows for selected parts
-
-
-\ctikzset{>/.style = {
-		\circuitikzbasekey/inputarrow = true
-	}
-}
-
-
-\endinput
-
-
-
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
index 6d5d09aeb50..e8feabfc80c 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmonopoles.tex
@@ -501,65 +501,5 @@
 
 }
 
-% oscillator
-\pgfdeclareshape{oscillator}{
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{north}{
-		\pgf@x=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@x=-0.5\pgf@x
-		\pgf@y=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@y=0.5\pgf@y
-	}
-	\anchor{south}{
-		\pgf@x=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@x=-0.5\pgf@x
-		\pgf@y=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@y=-0.5\pgf@y
-	}
-	\anchor{east}{
-		\pgfpointorigin
-		\pgf@x=-\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-	}
-	\anchor{west}{
-		\pgfpointorigin
-	}
-	\anchor{text}{
-		\pgf@x=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@x=-2\pgf@x
-		\advance \pgf@x by -.5\wd\pgfnodeparttextbox
-		\pgf@y=-\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\advance \pgf@y by -1.5\ht\pgfnodeparttextbox
-	}
-	\behindforegroundpath{		
-		\pgf@circ@res@step=\ctikzvalof{monopoles/oscillator/width}\pgf@circ@Rlen
-		\pgf@circ@res@step=.5\pgf@circ@res@step
-		
-		\pgfscope		
-			\pgfpathmoveto{\pgfpointorigin}
-			\pgfstartlinewidth=\pgflinewidth
-			
-			% draw circle
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\pgfpathcircle{\pgfpoint{-\pgf@circ@res@step}{0}} {\pgf@circ@res@step}
-			\pgfusepath{draw}
-
-			% draw inner sine waves
-			\pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-			\pgfsetlinewidth{\pgfstartlinewidth}
-
-			\pgfpathmoveto{\pgfpoint{-1.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}
-					
-			\pgfsetlinewidth{\pgfstartlinewidth}
-
-		\endpgfscope
-	}
-}
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircnpoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircnpoles.tex
deleted file mode 100644
index 790d997a040..00000000000
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircnpoles.tex
+++ /dev/null
@@ -1,599 +0,0 @@
-%
-% 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.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% N-poles
-
-\pgfkeys{/tikz/circuitikz,lab/.code={
-	
-
-}}
-
-\long\def\pgfcircdeclarenpole#1#2#3{
-	\pgfdeclareshape{#1}
-	{
-	  \anchor{center}{
-	  	\northwest
-		\pgf@x=0pt
-	  }
-	  \savedanchor\northwest{%
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=.5\pgf@x
-		\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
-			
-			%\pgf@circ@Rlen=\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-			
-			#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
-	  }
-}
-
-\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}
-	
-}
-
-
-	
-	% contrib Kristofer M. Monisit
-	
-	\pgfdeclareshape{fd op amp}
-	{
-	  \anchor{center}{\pgfpointorigin}
-	  \savedanchor\northwest{%
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@x
-		\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/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/input height}\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@x
-		\pgf@x=.5\pgf@x
-	  }
-	  \anchor{-}{
-		\inOne
-	  }
-	  \anchor{+}{
-		\inOne
-		\pgf@y=-\pgf@y
-	  }
-	  \savedanchor\up{%
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/height}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/width}\pgf@x
-		\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}]{\scriptsize\ $-$}
-  
-
-      % 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}]{\scriptsize\ $+$}
-  
-
-      % 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}]{\scriptsize\ $-$}
-  
-
-      % 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}]{\scriptsize\ $+$}
-  
-
-      % 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}}
-        \pgfusepath{draw}
-      \endpgfscope
-	  }
-	}
-
-
-
-
-\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@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}
-
-}{}
-
-%% coupler
-% defines a general outer box for couplers
-% TikZ usage: 
-%		\draw (0,0) node[coupler](coup){\SI{-3}{dB}}
-%		(coup.port1) to[short,-o] ++(-1,0)
-%
-
-\long\def\pgfcircdeclarecoupler#1#2{
-	\pgfdeclareshape{#1}{
-		\anchor{center}{
-			\northwest
-			\pgf@x=0pt
-			\pgf@y=0pt
-		}
-		\savedanchor\northwest{%
-			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/coupler/height}\pgf@y
-			\pgf@y=.5\pgf@y
-			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-			\pgf@x=.5\pgf@x
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/coupler/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
-
-		}
-	}
-}
-
-% straight coupler
-\pgfcircdeclarecoupler{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}
-}
-
-% "bended" coupler
-\pgfcircdeclarecoupler{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}
-	
-	
-}
-
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
index bbe5ce53176..b0566e7840c 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircquadpoles.tex
@@ -308,7 +308,7 @@
       \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}]{\scriptsize\ $-$}
+      \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
@@ -318,7 +318,7 @@
       \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}]{\scriptsize\ $+$}
+      \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
@@ -328,7 +328,7 @@
       \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}]{\scriptsize\ $-$}
+      \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
@@ -338,7 +338,7 @@
       \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}]{\scriptsize\ $+$}
+      \pgftext[left, at=\pgfpoint{0.3\pgf@circ@res@left}{.3\pgf@circ@res@up}]{\pgfkeysvalueof{/tikz/circuitikz/tripoles/op amp/font} $+$}
   
 
       % Draw them all!
@@ -424,14 +424,14 @@
 
 }{}
 
-%% coupler
-% defines a general outer box for couplers
+%% four-port
+% defines a general outer box for four-ports
 % TikZ usage: 
 %		\draw (0,0) node[coupler](coup){\SI{-3}{dB}}
 %		(coup.port1) to[short,-o] ++(-1,0)
 %
 
-\long\def\pgfcircdeclarecoupler#1#2{
+\long\def\pgfcircdeclarefourport#1#2{
 	\pgfdeclareshape{#1}{
 		\anchor{center}{
 			\northwest
@@ -440,11 +440,11 @@
 		}
 		\savedanchor\northwest{%
 			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/coupler/height}\pgf@y
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/height}\pgf@y
 			\pgf@y=.5\pgf@y
 			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
 			\pgf@x=.5\pgf@x
-			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/coupler/width}\pgf@x
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/quadpoles/#1/width}\pgf@x
 			}
 		\anchor{north}{
 			\northwest
@@ -516,6 +516,7 @@
 			\northwest
 			\pgf@y=0.5\pgf@y
 		}
+		
 		\anchor{text}{
 			\northwest
 			\advance \pgf@y by 0.5\ht\pgfnodeparttextbox
@@ -539,13 +540,19 @@
 				
 				% draw inner stuff
 				#2
-
+				
+				% draw inner text
+				\pgftext[center,x=-0.15\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
 		}
 	}
 }
 
+% four-port
+\pgfcircdeclarefourport{fourport}{}
+
+
 % straight coupler
-\pgfcircdeclarecoupler{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}}
@@ -564,7 +571,7 @@
 }
 
 % "bended" coupler
-\pgfcircdeclarecoupler{coupler2}{
+\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}}
@@ -592,4 +599,3 @@
 	
 	
 }
-
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
index 08d90980197..4673d710b31 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex
@@ -148,4 +148,24 @@
 
 }
 
+
+%% 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
+	}
+
+}
+
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
index 148a1564e49..5c8313efe67 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirctripoles.tex
@@ -11,227 +11,8 @@
 %% Tripoles
 
 
-\pgfdeclareshape{mixer}
-{
-	\savedanchor\northwest{
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@x
-		\pgf@x=.5\pgf@x
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=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 circle
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
-			% draw inner stuff
-			\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}}
-			\pgfsetlinewidth{2\pgflinewidth}
-			\pgfusepath{draw}
-		\endpgfscope				  
-	}
-}
-
-\pgfdeclareshape{adder}
-{
-	\savedanchor\northwest{
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@x
-		\pgf@x=.5\pgf@x
-	}
-	\anchor{center}{
-		\pgfpointorigin
-	}
-	\anchor{left}{%
-		\northwest
-		\pgf@y=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 circle
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
-			\pgfpathcircle{\pgfpoint{0}{0}} {0.5\pgf@circ@res@step}
-			\pgfusepath{draw}
-			
-			% draw inner stuff
-			\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				  
-	}
-}
-
-
 
-	\pgfdeclareshape{spdt}
+\pgfdeclareshape{spdt}
 	{
 	  \savedanchor\northwest{%
 		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
@@ -1062,7 +843,7 @@
 	  \anchor{text}{
 		  \northeast
 		  \pgfpoint
-			  {12\pgf@circ@res@right +0.2*(\pgf@circ@res@right-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left)}
+			  {12\pgf@circ@res@right +0.2*(\pgf@circ@res@right-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@circ@res@left)}
 			  {0.6\pgf@y}
       }
 	  %
@@ -1113,10 +894,19 @@
 	  \anchor{south east}{
 		\northeast
 		\pgf@y=-\pgf@y
-	  }	  
-	  
+	  }
+	 \anchor{B}{
+		 	\left
+	 }
+	 \anchor{base}{
+		 	\left
+	 }	
+ 	 \anchor{nobase}{
+  		 	\left
+  		 	\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@x
+ 	 }	
 	  #2
-	  \backgroundpath{			
+	  \backgroundpath{		
 			\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
 			%
 			%
@@ -1133,203 +923,6 @@
 	}
 }
 
-
-
-
-
-
-\long\def\pgfcircdeclaremos#1#2#3{
-	\pgfcircdeclaretransistor{#1}{
-		  \anchor{G}{
-			\left
-		  }
-		  \anchor{gate}{
-			\left
-		  }
-		  \anchor{B}{
-			\left
-			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@x
-		  }
-		  \anchor{base}{
-			\left
-			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/base width}\pgf@x
-		  }
-		  #2
-	  }
-	  {#3}
-}
-
-
-
-
-
-
-
-
-
-\pgfcircdeclaremos{nmos}{
-		  \anchor{D}{
-			\northeast
-		  }
-		  \anchor{drain}{
-			\northeast
-		  }
-		  \anchor{S}{
-			\northeast
-			\pgf@y=-\pgf@y
-		  }
-		  \anchor{source}{
-			\northeast
-			\pgf@y=-\pgf@y
-		  }
-}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\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/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/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}}		
-			\pgfusepath{draw}
-			
-			\pgfscope
-			\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
-				{\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}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
-}
-
-
-\pgfcircdeclaremos{pmos}{
-		  \anchor{S}{
-			\northeast
-		  }
-		  \anchor{source}{
-			\northeast
-		  }
-		  \anchor{D}{
-			\northeast
-			\pgf@y=-\pgf@y
-		  }
-		  \anchor{drain}{
-			\northeast
-			\pgf@y=-\pgf@y
-		  }
-}{%
-			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-			\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
-
-			\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}}
-			\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}}		
-
-			\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}}
-					
-					
-			\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}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
-			
-			\pgfpathcircle{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/gate width}\pgf@circ@res@left - \pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}}
-			\pgfusepath{draw,fill}		
-
-}
-
-
-
-
-
-
-
 \pgfcircdeclaretransistor{pnp}{
 		  \anchor{E}{
 			\northeast
@@ -1337,12 +930,6 @@
 		  \anchor{emitter}{
 			\northeast
 		  }
-		  \anchor{B}{
-			\left
-		  }
-		  \anchor{base}{
-			\left
-		  }		  
 		  \anchor{C}{
 			\northeast
 			\pgf@y=-\pgf@y
@@ -1354,28 +941,28 @@
 }{
 			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height}\pgf@circ@res@up}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height}\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height 2}\pgf@circ@res@up}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height 2}\pgf@circ@res@up}}
 			\pgfusepath{draw}
 
 			\pgfscope
 			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base width}\pgf@circ@res@left}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height}\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base width}\pgf@circ@res@left}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height}\pgf@circ@res@down}}
 			\pgfsetlinewidth{2\pgflinewidth}
 			\pgfusepath{draw}
 			\endpgfscope
 			
 			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height 2}\pgf@circ@res@down}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height 2}\pgf@circ@res@down}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height}\pgf@circ@res@down}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height}\pgf@circ@res@down}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}		
 			\pgfusepath{draw}
 	
@@ -1386,20 +973,45 @@
 			\pgftransformlineattime{.5}{%
 				\pgfpoint%
 					{\pgf@circ@res@right}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height}\pgf@circ@res@up}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height}\pgf@circ@res@up}%
 			}{%
 				\pgfpoint
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate height 2}\pgf@circ@res@up}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base width}\pgf@circ@res@left}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/base height 2}\pgf@circ@res@up}%
 			}
 			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
 			\endpgfscope
-		
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pnp/gate width}\pgf@circ@res@left}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
+			\ifpgf@circuit@bpt@drawphoto
+						\pgfscope
+						\pgfsetarrowsstart{latex'}
+						\pgfpathmoveto{\pgfpointadd{\pgfpoint
+											{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/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/npn/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/npn/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/npn/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/pnp/base width}\pgf@circ@res@left}
+					{\pgf@circ@res@up+\pgf@circ@res@down}}
+				\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
+				\pgfusepath{draw}
+			\fi
+			\fi
 }
 
 
@@ -1414,12 +1026,6 @@
 		  \anchor{collector}{
 			\northeast
 		  }
-		  \anchor{B}{
-			\left
-		  }
-		  \anchor{base}{
-			\left
-		  }		  
 		  \anchor{E}{
 			\northeast
 			\pgf@y=-\pgf@y
@@ -1431,28 +1037,28 @@
 }{%
 			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height}\pgf@circ@res@up}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height}\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height 2}\pgf@circ@res@up}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height 2}\pgf@circ@res@up}}
 			\pgfusepath{draw}
 
 			\pgfscope
 			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base width}\pgf@circ@res@left}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height}\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base width}\pgf@circ@res@left}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height}\pgf@circ@res@down}}
 			\pgfsetlinewidth{2\pgflinewidth}
 			\pgfusepath{draw}
 			\endpgfscope
 			
 			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height 2}\pgf@circ@res@down}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base width}\pgf@circ@res@left}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height 2}\pgf@circ@res@down}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height}\pgf@circ@res@down}}
+				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height}\pgf@circ@res@down}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}		
 			\pgfusepath{draw}
 	
@@ -1462,22 +1068,46 @@
 			\pgfresetnontranslationattimefalse
 			\pgftransformlineattime{.5}{%
 				\pgfpoint%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height 2}\pgf@circ@res@down}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base width}\pgf@circ@res@left}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height 2}\pgf@circ@res@down}%
 			}{%
 				\pgfpoint{\pgf@circ@res@right}%
-					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate height}\pgf@circ@res@down}%
+					{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/base height}\pgf@circ@res@down}%
 			}
 			\pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
 			\endpgfscope
-		
-			\pgfpathmoveto{\pgfpoint
-				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/gate width}\pgf@circ@res@left}
-				{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
-			\pgfusepath{draw}
-			
 			
+			\ifpgf@circuit@bpt@drawphoto
+				\pgfscope
+				\pgfsetarrowsstart{latex'}
+				\pgfpathmoveto{\pgfpointadd{\pgfpoint
+									{\pgfkeysvalueof{/tikz/circuitikz/tripoles/npn/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/npn/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/npn/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/npn/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/npn/base width}\pgf@circ@res@left}
+					{\pgf@circ@res@up+\pgf@circ@res@down}}
+				\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
+				\pgfusepath{draw}
+			\fi
+			\fi
 }
 
 
@@ -1667,18 +1297,346 @@
 %%
 % IGFET (e.g. MOSFET)
 \long\def\pgfcircdeclarefet#1#2#3{
-  \pgfcircdeclaretransistor{#1}{
-      \anchor{B}{
-      \left
-      \pgf@x=\pgf@circ@res@right
-      }
-      \anchor{base}{
-      \left
-      \pgf@x=\pgf@circ@res@right
-      }
-      #2
-    }
-    {#3}
+\pgfdeclareshape{#1}{
+	\anchor{center}
+		{\pgfpointorigin}
+	\savedanchor\northeast{% upper right
+		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/height}\pgf@y
+		\pgf@y=.5\pgf@y
+		\pgf@x=0pt
+	}
+	\savedanchor\left{%center left
+		\pgf@y=0pt
+		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/width}\pgf@x
+	}
+	\anchor{text}{
+		\northeast
+		\pgfpoint
+		{12\pgf@circ@res@right +0.2*(\pgf@circ@res@right-\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@circ@res@left)}
+		{0.6\pgf@y}
+	}
+	%
+	% pseudo-bipole
+	\anchor{left}{ % south
+		\northeast
+		\pgf@y=-\pgf@y
+	}
+		\anchor{right}{
+		\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}{
+		\pgf@x=0pt
+		\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{G}{
+		\left
+	}
+	\anchor{gate}{
+		\left
+	}
+	\anchor{B}{
+		\left
+		\pgf@x=\pgf@circ@res@right
+	}
+	\anchor{base}{
+		\left
+		\pgf@x=\pgf@circ@res@right
+	}
+	\anchor{Bulk}{
+		\left
+		\pgf@x=\pgf@circ@res@right
+	}
+	\anchor{nobase}{
+		\left
+		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@x
+	}
+	\anchor{nogate}{
+		\left
+		\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/#1/gate width}\pgf@x
+	}	
+	#2
+	\backgroundpath{		
+		\pgfsetcolor{\pgfkeysvalueof{/tikz/circuitikz/color}}	
+		%
+		%
+		\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}}
+	         \ifpgf@circuit@fet@ntype
+		         \pgftransformrotate{90}
+	         \else
+		         \pgftransformrotate{-90}
+	         \fi
+			\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}}
+	       \ifpgf@circuit@fet@ntype
+			 	\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{east}}
+	       \else
+				\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{west}}
+	       \fi	
+		\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}}
+	       \ifpgf@circuit@fet@ntype
+			 	\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{west}}
+	       \else
+				\pgfpathlineto{\pgfpointanchor{pgf@bodydiode}{east}}
+	       \fi	
+		\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
+}
+
+\pgfcircdeclarefet{nmos}{
+		  \anchor{B}{
+			\left
+			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@x
+		  }
+		  \anchor{base}{
+			\left
+			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/nmos/base width}\pgf@x
+		  }
+		  \anchor{D}{
+			\northeast
+		  }
+		  \anchor{drain}{
+			\northeast
+		  }
+		  \anchor{S}{
+			\northeast
+			\pgf@y=-\pgf@y
+		  }
+		  \anchor{source}{
+			\northeast
+			\pgf@y=-\pgf@y
+		  }
+}{%
+		\pgf@circuit@fet@ntypetrue
+			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+			\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/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/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}}		
+			\pgfusepath{draw}
+			
+			\pgfscope
+			\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
+
+		\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}{\pgf@circ@res@up+\pgf@circ@res@down}}
+			\pgfusepath{draw}
+		\fi
+}
+
+
+\pgfcircdeclarefet{pmos}{
+		  \anchor{B}{
+			\left
+			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@x
+		  }
+		  \anchor{base}{
+			\left
+			\pgf@x=\pgfkeysvalueof{/tikz/circuitikz/tripoles/pmos/base width}\pgf@x
+		  }
+		  \anchor{S}{
+			\northeast
+		  }
+		  \anchor{source}{
+			\northeast
+		  }
+		  \anchor{D}{
+			\northeast
+			\pgf@y=-\pgf@y
+		  }
+		  \anchor{drain}{
+			\northeast
+			\pgf@y=-\pgf@y
+		  }
+}{%
+		\pgf@circuit@fet@ntypefalse
+			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+			\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
+
+			\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}}
+			\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}}		
+
+			\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}}
+			\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}{\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}*\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}}
+				{\pgf@circ@res@up+\pgf@circ@res@down}}{\pgfkeysvalueof{/tikz/circuitikz/nodes width}*\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}}
+			\ifpgf@circuit@pmos@emptycircle
+				\pgfsetfillcolor{white}
+			\fi
+			\pgfusepath{draw,fill}		
 }
 
 
@@ -1706,6 +1664,7 @@
       }
 
 }{%
+	\pgf@circuit@fet@ntypetrue
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nfet/gate height}\pgf@circ@res@up}}
@@ -1767,18 +1726,19 @@
           {\pgf@circ@res@up+\pgf@circ@res@down}%
       }{%
         \pgfpoint%
-          {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/base width}\pgf@circ@res@left}%
+          {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nfet/base width}\pgf@circ@res@left}%
           {\pgf@circ@res@up+\pgf@circ@res@down}%
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
 
-          
+      \ifpgf@circuit@bpt@drawgate	    
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nfet/gate width}\pgf@circ@res@left}
         {\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 
@@ -1805,6 +1765,7 @@
       }
 
 }{%
+	\pgf@circuit@fet@ntypefalse
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pfet/gate height}\pgf@circ@res@up}}
@@ -1871,19 +1832,20 @@
           {\pgf@circ@res@up+\pgf@circ@res@down}%
       }{%
         \pgfpoint%
-          {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/base width}\pgf@circ@res@left}%
+          {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pfet/base width}\pgf@circ@res@left}%
           {\pgf@circ@res@up+\pgf@circ@res@down}%
       }
 	  \pgftransformrotate{180}
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
 
-          
+      \ifpgf@circuit@bpt@drawgate	   
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pfet/gate width}\pgf@circ@res@left}
         {\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 
@@ -1915,6 +1877,7 @@
          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@y
       }
 }{%
+	\pgf@circuit@fet@ntypetrue
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -1963,12 +1926,13 @@
       \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
       % GATE
       \pgfscope
       \pgfpathmoveto{\pgfpoint
@@ -1998,14 +1962,19 @@
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
 
+			\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate width}\pgf@circ@res@left}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
+
+
+
 % N-CHANNEL IGFET ENHANCEMENT TYPE with Bulk connector
 \pgfcircdeclarefet{nigfetebulk}{ %nur ohne strich zwischen Bulk und Source
       \anchor{D}{
@@ -2033,6 +2002,7 @@
          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate height}\pgf@y
       }
 }{%
+	\pgf@circuit@fet@ntypetrue
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2110,13 +2080,14 @@
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
-
+			\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate width}\pgf@circ@res@left}
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate height}\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetebulk/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 
@@ -2149,6 +2120,7 @@
       }
 
 }{%
+	\pgf@circuit@fet@ntypetrue
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2186,12 +2158,13 @@
       
             
       % 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
       % GATE
       \pgfscope
       \pgfpathmoveto{\pgfpoint
@@ -2220,7 +2193,7 @@
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
-
+			\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetd/gate width}\pgf@circ@res@left}
@@ -2228,6 +2201,7 @@
       %\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfetd/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 % P-CHANNEL IGFET ENHANCEMENT TYPE
@@ -2257,6 +2231,7 @@
          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfete/gate height}\pgf@y
       }
 }{%
+\pgf@circuit@fet@ntypefalse
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2311,12 +2286,13 @@
       
       
       % 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@down}}
         \pgfnode{circ}{center}{}{}{}
       \endpgfscope
-      
+      \fi
       % GATE
       \pgfscope
       \pgfpathmoveto{\pgfpoint
@@ -2347,7 +2323,7 @@
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
-
+			\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION (in line with source)
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfete/gate width}\pgf@circ@res@left}
@@ -2355,6 +2331,7 @@
       %\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfete/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 % P-CHANNEL IGFET ENHANCEMENT TYPE with bulk connector
@@ -2384,6 +2361,7 @@
          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfetebulk/gate height}\pgf@y
       }
 }{%
+	\pgf@circuit@fet@ntypefalse
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2468,7 +2446,7 @@
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
-
+			\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION (in line with source)
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfetebulk/gate width}\pgf@circ@res@left}
@@ -2476,6 +2454,7 @@
       %\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfetebulk/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 
@@ -2506,6 +2485,7 @@
          \pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@y
       }
 }{%
+	\pgf@circuit@fet@ntypefalse
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2552,12 +2532,13 @@
       
             
       % 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
       % GATE
       \pgfscope
       \pgfpathmoveto{\pgfpoint
@@ -2588,7 +2569,7 @@
       }
       \pgfnode{currarrow}{center}{}{}{\pgfusepath{stroke}}
       \endpgfscope
-
+	\ifpgf@circuit@bpt@drawgate	
       % GATE CONNECTION
       \pgfpathmoveto{\pgfpoint
         {\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfetd/gate width}\pgf@circ@res@left}
@@ -2596,6 +2577,7 @@
       %\pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+\pgf@circ@res@down}}
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pigfetd/gate height}\pgf@circ@res@down}}
       \pgfusepath{draw}
+      \fi
 }
 
 
@@ -2604,12 +2586,7 @@
 
 %% Contrib Danilo Piazzalunga
 
-
-
-
-
-
-\pgfcircdeclaretransistor{njfet}{
+\pgfcircdeclarefet{njfet}{
 		  \anchor{G}{
 			\left
 			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
@@ -2639,6 +2616,7 @@
 			\pgf@y=-\pgf@y
 		  }
 }{%
+		\pgf@circuit@fet@ntypetrue
 			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/njfet/gate height 2}\pgf@circ@res@up}}
@@ -2679,8 +2657,7 @@
 			}
 			\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}}
@@ -2690,7 +2667,7 @@
 }
 
 
-\pgfcircdeclaretransistor{pjfet}{
+\pgfcircdeclarefet{pjfet}{
 		  \anchor{G}{
 			\left
 			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
@@ -2720,6 +2697,7 @@
 			\pgf@y=-\pgf@y
 		  }
 }{%
+		\pgf@circuit@fet@ntypefalse
 			\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
 			\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
 				{\pgfkeysvalueof{/tikz/circuitikz/tripoles/pjfet/gate height 2}\pgf@circ@res@up}}
@@ -2802,6 +2780,7 @@
       \pgf@y=-\pgf@y
       }
 }{%
+	\pgf@circuit@fet@ntypetrue
       \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
       % DRAIN CONNECTION 
       \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}
@@ -2856,12 +2835,13 @@
       
             
       % SOLDER DOT at source-bulk connection
-      \pgfscope
-        \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{
-          \pgfkeysvalueof{/tikz/circuitikz/tripoles/nigfete/gate height}\pgf@circ@res@down}}
-        \pgfnode{circ}{center}{}{}{}
-      \endpgfscope{}
-      
+      \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 
@@ -2907,18 +2887,6 @@
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 %% Black thyristor
 
 \pgfcircdeclarebipole{
@@ -3307,7 +3275,7 @@
 	\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}]{\ $-$}
+	\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
@@ -3316,7 +3284,7 @@
 	\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}]{\ $+$}
+	\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}} %
@@ -3420,16 +3388,406 @@
 }
 
 
-\pgfdeclareshape{circulator}
+\pgfdeclareshape{mixer}
 {
 	\savedanchor\northwest{
-		\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@y
-		\pgf@y=.5\pgf@y
-		\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
-		\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@x
+		\ifpgf@circuit@boxed
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@x
+			\pgf@x=.5\pgf@x
+		\else	
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/mixer/width}\pgf@x
+			\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
+	}
+}
+
+\pgfdeclareshape{adder}
+{
+	\savedanchor\northwest{
+		\ifpgf@circuit@boxed
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@x
+			\pgf@x=.5\pgf@x
+		\else	
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/adder/width}\pgf@x
+			\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				  
+	}
+}
+
+\pgfdeclareshape{oscillator}
+{
+	\savedanchor\northwest{
+		\ifpgf@circuit@boxed
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@x
+		\else	
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/oscillator/width}\pgf@x
+		\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}
+
+			\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}
+{
+	\savedanchor\northwest{
+		\ifpgf@circuit@boxed
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@x
+			\pgf@x=.5\pgf@x
+		\else	
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/circulator/width}\pgf@x
+			\pgf@x=.5\pgf@x
+		\fi
+	}
 	\anchor{center}{
 		\pgfpointorigin
 	}
@@ -3440,7 +3798,7 @@
 	\anchor{1}{
 		\northwest
 		\pgf@y=0pt
-	}	  
+	}
 	\anchor{2}{
 		\northwest
 		\pgf@y=0pt
@@ -3493,19 +3851,31 @@
 		\pgfscope
 			\pgfstartlinewidth=\pgflinewidth
 			
+			% draw outer box
+			\ifpgf@circuit@boxed
+				\pgfnode{box}{center}{}{pgf@box}{\pgfusepath{draw}}
+			\fi
+			
 			% draw outer circle
-			\pgfsetlinewidth{\pgfkeysvalueof{/tikz/circuitikz/bipoles/thickness}\pgfstartlinewidth}
+			\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}
 			
 			% 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				  
 	}
 }
@@ -3596,6 +3966,8 @@
 				\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}}
@@ -3635,5 +4007,108 @@
 		}
 }
 
+% electromechanical device (motor/generator)
+\pgfdeclareshape{elmech}
+{
+	\savedanchor\northwest{
+		%\ifpgf@circuit@boxed
+		%	\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+		%	\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@y
+		%	\pgf@y=.5\pgf@y
+		%	\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+		%	\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/bipoles/twoport/width}\pgf@x
+		%	\pgf@x=.5\pgf@x
+		%\else
+			\pgf@y= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@y=\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/height}\pgf@y
+			\pgf@y=.5\pgf@y
+			\pgf@x= \pgfkeysvalueof{/tikz/circuitikz/bipoles/length}
+			\pgf@x=-\pgfkeysvalueof{/tikz/circuitikz/tripoles/elmech/width}\pgf@x
+			\pgf@x=.5\pgf@x
+		%\fi
+	}
+	\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
+	}
+}
 
 \endinput
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
index 97e6259df39..2127cecb934 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
@@ -47,9 +47,23 @@
 				\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 
@@ -122,11 +136,21 @@
 		\fi	
 	\else
 		\ifpgf@circuit@bipole@voltage@backward
-			(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]{$-$}
+			\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
-			(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]{$+$}
+			\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
 }