57 files changed, 2319 insertions, 3000 deletions

diff --git a/FILES.byname b/FILES.byname
index 621c112d4e..3cf61649f7 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2035,12 +2035,12 @@
 2022/09/23 |       1673 | biblio/citation-style-language/README.md
 2022/09/23 |      11958 | biblio/citation-style-language/vancouver.csl
 2022/09/23 |     591448 | biblio/citation-style-language.zip
-2022/12/09 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/12/10 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
 2022/10/08 |        127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2022/12/09 |    2748449 | biblio/ctan-bibdata/ctan.bib
-2022/12/09 |    3627112 | biblio/ctan-bibdata/ctan.pdf
+2022/12/10 |    2748446 | biblio/ctan-bibdata/ctan.bib
+2022/12/10 |    3627200 | biblio/ctan-bibdata/ctan.pdf
 2022/10/08 |       1415 | biblio/ctan-bibdata/README
-2022/12/09 |    4020414 | biblio/ctan-bibdata.zip
+2022/12/10 |    4021446 | biblio/ctan-bibdata.zip
 2022/02/06 |       3110 | biblio/pbibtex/pbibtex-base/cpp.awk
 2022/02/06 |       1009 | biblio/pbibtex/pbibtex-base/generate.sh
 2022/02/06 |      22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -5414,7 +5414,7 @@
 1990/10/02 |       5440 | dviware/vutex/vaxvms.hlp
 1990/10/02 |        812 | dviware/vutex/vaxvms.ins
 1990/10/02 |     127576 | dviware/vutex/vutex.web
-2022/12/09 |      75484 | FILES.last07days
+2022/12/10 |      72468 | FILES.last07days
 2021/07/24 |    1139410 | fonts/aboensis/Aboensis.glyphs
 2021/07/24 |   18907382 | fonts/aboensis/aboensis.pdf
 2021/07/24 |     137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -159232,60 +159232,60 @@
 2019/04/14 |      24014 | graphics/pgf/contrib/chordbox/chordbox.tex
 2019/04/14 |       1125 | graphics/pgf/contrib/chordbox/README.md
 2019/04/15 |     567774 | graphics/pgf/contrib/chordbox.zip
-2022/11/12 |      45620 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
-2022/11/12 |      17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2022/11/12 |        938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
-2022/11/12 |    1599964 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2022/11/12 |     508005 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
-2022/11/12 |        418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
-2022/11/12 |       8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2022/11/12 |       3802 | graphics/pgf/contrib/circuitikz/README.md
-2022/11/12 |     364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
-2022/11/12 |        728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
-2022/11/12 |     393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
-2022/11/12 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
-2022/11/12 |     403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
-2022/11/12 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
-2022/11/12 |     422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
-2022/11/12 |        641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
-2022/11/12 |     690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
-2022/11/12 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
-2022/11/12 |     758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
-2022/11/12 |        633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
-2022/11/12 |     841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
-2022/11/12 |        626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2022/11/12 |     937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
-2022/11/12 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
-2022/11/12 |    1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
-2022/11/12 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
-2022/11/12 |    1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
-2022/11/12 |        631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
-2022/11/12 |      13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
-2022/11/12 |        280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
-2022/11/12 |       3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
-2022/11/12 |       2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2022/11/12 |     279670 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2022/11/12 |       9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
-2022/11/12 |      41380 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
-2022/11/12 |       9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
-2022/11/12 |      15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2022/11/12 |      56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2022/11/12 |     112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2022/11/12 |      16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
-2022/11/12 |     114251 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2022/11/12 |      33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2022/11/12 |     375338 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
-2022/11/12 |      14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
-2022/11/12 |      35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
-2022/11/12 |     416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2022/11/12 |     683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2022/11/12 |     751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2022/11/12 |     834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
-2022/11/12 |     929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2022/11/12 |    1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
-2022/11/12 |    1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
-2022/11/12 |       3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2022/11/12 |    3189008 | graphics/pgf/contrib/circuitikz.zip
+2022/12/10 |      47166 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/12/10 |      17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/12/10 |        938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/12/10 |    1629420 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/12/10 |     516430 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/12/10 |        418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/12/10 |       8445 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/12/10 |       3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/12/10 |     364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/12/10 |        728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/12/10 |     393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/12/10 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/12/10 |     403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/12/10 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/12/10 |     422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/12/10 |        641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/12/10 |     690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/12/10 |     758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/12/10 |        633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/12/10 |     841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/12/10 |        626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/12/10 |     937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/12/10 |    1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/12/10 |    1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/12/10 |        631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/12/10 |      13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/12/10 |        280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/12/10 |       3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/12/10 |       2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/12/10 |     281961 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/12/10 |       9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/12/10 |      41491 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/12/10 |       9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/12/10 |      15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/12/10 |      56360 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/12/10 |     112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/12/10 |      16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/12/10 |      83192 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/12/10 |      33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/12/10 |     377503 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/12/10 |      14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/12/10 |      35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/12/10 |     416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/12/10 |     683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/12/10 |     751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/12/10 |     834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/12/10 |     929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/12/10 |    1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/12/10 |    1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/12/10 |       3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/12/10 |    3221863 | graphics/pgf/contrib/circuitikz.zip
 2019/07/12 |      14811 | graphics/pgf/contrib/codeanatomy/codeanatomy.dtx
 2019/07/12 |       1475 | graphics/pgf/contrib/codeanatomy/codeanatomy.ins
 2019/07/12 |     123921 | graphics/pgf/contrib/codeanatomy/codeanatomy.lstlisting.pdf
@@ -190166,7 +190166,7 @@
 2021/05/15 |   12827514 | install/graphics/pgf/base/pgf.tds.zip
 2013/02/23 |      92056 | install/graphics/pgf/contrib/battleship.tds.zip
 2016/02/19 |     701759 | install/graphics/pgf/contrib/celtic.tds.zip
-2022/11/12 |    3208432 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/12/10 |    3241670 | install/graphics/pgf/contrib/circuitikz.tds.zip
 2020/06/12 |     573255 | install/graphics/pgf/contrib/commutative-diagrams.tds.zip
 2017/06/01 |    1005947 | install/graphics/pgf/contrib/hobby.tds.zip
 2014/06/15 |     843875 | install/graphics/pgf/contrib/logicpuzzle.tds.zip
@@ -190406,7 +190406,7 @@
 2013/04/01 |     161671 | install/macros/latex/contrib/needspace.tds.zip
 2009/09/03 |     162586 | install/macros/latex/contrib/newfile.tds.zip
 2019/11/24 |     124707 | install/macros/latex/contrib/newfloat.tds.zip
-2012/12/12 |     618333 | install/macros/latex/contrib/nicefilelist.tds.zip
+2022/12/10 |     615315 | install/macros/latex/contrib/nicefilelist.tds.zip
 2015/11/21 |    2745330 | install/macros/latex/contrib/nicetext.tds.zip
 2018/07/28 |     247791 | install/macros/latex/contrib/nidanfloat.tds.zip
 2011/04/15 |     852802 | install/macros/latex/contrib/nonumonpart.tds.zip
@@ -197984,7 +197984,7 @@
 2013/04/01 |      14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
 2018/03/05 |         11 | macros/context/contrib/context-visualcounter/VERSION
 2018/03/22 |     276789 | macros/context/contrib/context-visualcounter.zip
-2022/12/07 |  115557553 | macros/context/latest/cont-tmf.zip
+2022/12/09 |  115563634 | macros/context/latest/cont-tmf.zip
 2016/04/21 |      32846 | macros/cstex/base/cmexb.tar.gz
 2016/06/26 |    1728262 | macros/cstex/base/csfonts-t1.tar.gz
 2007/03/01 |     187106 | macros/cstex/base/csfonts.tar.gz
@@ -208984,18 +208984,18 @@
 2022/09/10 |       1236 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
 2022/09/10 |      23314 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
 2022/09/10 |    1742414 | macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple.zip
-2022/06/22 |        575 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
-2022/06/22 |        722 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
-2022/06/22 |       1581 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
-2022/06/22 |        807 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
-2022/06/22 |       1027 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
-2022/06/22 |     230964 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.gif
-2022/06/22 |     632409 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
-2022/06/22 |       3398 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
-2021/12/15 |       1072 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/LICENSE
-2022/06/22 |       6337 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
-2022/06/22 |         18 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/VERSION
-2022/06/22 |     857595 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles.zip
+2022/12/10 |        561 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
+2022/12/10 |        876 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
+2022/12/10 |       2578 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
+2022/12/10 |        771 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
+2022/12/10 |       1583 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
+2022/12/10 |     657335 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
+2022/12/10 |     203366 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-sans.gif
+2022/12/10 |     215467 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-serif.gif
+2022/12/10 |       3901 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
+2022/12/10 |       1072 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/LICENSE
+2022/12/10 |       6915 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
+2022/12/10 |    1055235 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles.zip
 2016/09/24 |      12955 | macros/latex/contrib/beamer-contrib/themes/beamertheme-cuerna/beamertheme-cuerna.dtx
 2016/09/24 |       1663 | macros/latex/contrib/beamer-contrib/themes/beamertheme-cuerna/beamertheme-cuerna.ins
 2016/09/24 |     418475 | macros/latex/contrib/beamer-contrib/themes/beamertheme-cuerna/beamertheme-cuerna.pdf
@@ -224988,11 +224988,11 @@
 2016/07/03 |       1176 | macros/latex/contrib/milog/README.md
 2016/07/03 |     488253 | macros/latex/contrib/milog.zip
 2021/03/10 |      19106 | macros/latex/contrib/mindflow/LICENSE
-2022/02/01 |      21672 | macros/latex/contrib/mindflow/mindflow.dtx
+2022/12/06 |      21554 | macros/latex/contrib/mindflow/mindflow.dtx
 2021/03/12 |       1705 | macros/latex/contrib/mindflow/mindflow.ins
-2022/02/01 |     191911 | macros/latex/contrib/mindflow/mindflow.pdf
+2022/12/06 |     199947 | macros/latex/contrib/mindflow/mindflow.pdf
 2022/02/01 |        459 | macros/latex/contrib/mindflow/README.md
-2022/02/01 |     201792 | macros/latex/contrib/mindflow.zip
+2022/12/10 |     208835 | macros/latex/contrib/mindflow.zip
 2013/06/21 |         72 | macros/latex/contrib/minibox/minibox.ins
 2013/06/21 |     280644 | macros/latex/contrib/minibox/minibox.pdf
 2013/06/21 |       7633 | macros/latex/contrib/minibox/minibox.tex
@@ -226155,17 +226155,17 @@
 2017/03/29 |       9780 | macros/latex/contrib/nfssext-cfr/nfssext-cfr.tex
 2017/03/28 |       1414 | macros/latex/contrib/nfssext-cfr/README
 2017/03/29 |     189411 | macros/latex/contrib/nfssext-cfr.zip
-2012/12/12 |     647513 | macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
-2012/12/12 |        448 | macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
-2012/03/23 |          0 | macros/latex/contrib/nicefilelist/docsrc/empty.f
-2012/12/12 |       1529 | macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
-2012/12/12 |      16919 | macros/latex/contrib/nicefilelist/docsrc/nicefilelist.tex
-2012/10/29 |        207 | macros/latex/contrib/nicefilelist/docsrc/provonly.fd
-2012/10/30 |       1226 | macros/latex/contrib/nicefilelist/docsrc/srcfiles.tex
-2012/03/23 |         51 | macros/latex/contrib/nicefilelist/docsrc/wrong.prv
-2012/12/12 |      15686 | macros/latex/contrib/nicefilelist/nicefilelist.sty
-2012/10/30 |       1953 | macros/latex/contrib/nicefilelist/README
-2012/12/13 |     616613 | macros/latex/contrib/nicefilelist.zip
+2022/12/05 |     599529 | macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
+2022/12/05 |        492 | macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
+2022/12/05 |       1451 | macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
+2022/12/05 |       2104 | macros/latex/contrib/nicefilelist/README
+2022/12/05 |          0 | macros/latex/contrib/nicefilelist/source/empty.f
+2022/12/05 |      17436 | macros/latex/contrib/nicefilelist/source/nicefilelist.tex
+2022/12/05 |        206 | macros/latex/contrib/nicefilelist/source/provonly.fd
+2022/12/05 |       1225 | macros/latex/contrib/nicefilelist/source/srcfiles.tex
+2022/12/05 |         50 | macros/latex/contrib/nicefilelist/source/wrong.prv
+2022/12/05 |      16838 | macros/latex/contrib/nicefilelist/tex/nicefilelist.sty
+2022/12/10 |     613713 | macros/latex/contrib/nicefilelist.zip
 1996/03/22 |      19959 | macros/latex/contrib/niceframe/dingbat.mf
 1996/03/22 |         38 | macros/latex/contrib/niceframe/karta15.mf
 1996/03/22 |     171444 | macros/latex/contrib/niceframe/karta.mf
@@ -279958,7 +279958,7 @@
 2021/05/03 |        629 | support/TeX4ht/doc/README
 2020/08/24 |     358454 | support/TeX4ht/doc/TeX4ht-doc.tex
 2021/05/11 |        262 | support/TeX4ht/README
-2022/12/02 |     210677 | support/TeX4ht/source/ChangeLog
+2022/12/09 |     211044 | support/TeX4ht/source/ChangeLog
 2021/05/03 |       1375 | support/TeX4ht/source/checklog.lua
 2021/05/03 |       1189 | support/TeX4ht/source/common-code.tex
 2021/05/03 |       2727 | support/TeX4ht/source/common-info.tex
@@ -279966,11 +279966,11 @@
 2021/05/06 |         15 | support/TeX4ht/source/extra-bin/vcss
 2021/05/06 |         15 | support/TeX4ht/source/extra-bin/xmllint
 2022/11/17 |      27545 | support/TeX4ht/source/Makefile
-2022/11/28 |       8387 | support/TeX4ht/source/mktex4ht-cnf.tex
+2022/12/09 |       8411 | support/TeX4ht/source/mktex4ht-cnf.tex
 2021/05/03 |       1121 | support/TeX4ht/source/README
 2021/05/03 |       1744 | support/TeX4ht/source/t1fontmake.lua
 2021/05/03 |        297 | support/TeX4ht/source/t1fontsample.tex
-2022/12/02 |    1144061 | support/TeX4ht/source/tex4ht-4ht.tex
+2022/12/09 |    1151095 | support/TeX4ht/source/tex4ht-4ht.tex
 2021/05/03 |       7127 | support/TeX4ht/source/tex4ht-auto-script.tex
 2021/05/16 |       1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
 2022/06/05 |      21307 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -279997,7 +279997,7 @@
 2021/05/03 |      14218 | support/TeX4ht/source/tex4ht-htcmd.tex
 2021/05/03 |      70683 | support/TeX4ht/source/tex4ht-html0.tex
 2021/05/03 |     164748 | support/TeX4ht/source/tex4ht-html32.tex
-2022/12/01 |     619677 | support/TeX4ht/source/tex4ht-html4.tex
+2022/12/09 |     621798 | support/TeX4ht/source/tex4ht-html4.tex
 2022/08/11 |      11077 | support/TeX4ht/source/tex4ht-html5.tex
 2021/06/17 |     648233 | support/TeX4ht/source/tex4ht-html-speech.tex
 2021/05/03 |      59483 | support/TeX4ht/source/tex4ht-html-speech-xtpipes.tex
@@ -290891,9 +290891,9 @@
 2022/10/25 |     487888 | systems/texlive/tlnet/archive/lt3luabridge.doc.r64801.tar.xz
 2022/10/25 |       3004 | systems/texlive/tlnet/archive/lt3luabridge.r64801.tar.xz
 2022/10/25 |       4192 | systems/texlive/tlnet/archive/lt3luabridge.source.r64801.tar.xz
-2022/11/29 |     535776 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r65121.tar.xz
-2022/11/29 |       3528 | systems/texlive/tlnet/archive/lt3rawobjects.r65121.tar.xz
-2022/11/29 |      10044 | systems/texlive/tlnet/archive/lt3rawobjects.source.r65121.tar.xz
+2022/12/10 |     536804 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r65230.tar.xz
+2022/12/10 |       3724 | systems/texlive/tlnet/archive/lt3rawobjects.r65230.tar.xz
+2022/12/10 |      11808 | systems/texlive/tlnet/archive/lt3rawobjects.source.r65230.tar.xz
 2019/02/28 |     233152 | systems/texlive/tlnet/archive/ltablex.doc.r34923.tar.xz
 2019/02/28 |       2492 | systems/texlive/tlnet/archive/ltablex.r34923.tar.xz
 2019/02/28 |     267928 | systems/texlive/tlnet/archive/ltabptch.doc.r17533.tar.xz
@@ -294642,8 +294642,8 @@
 2019/02/28 |     292656 | systems/texlive/tlnet/archive/simplecv.doc.r35537.tar.xz
 2019/02/28 |       2112 | systems/texlive/tlnet/archive/simplecv.r35537.tar.xz
 2019/02/28 |       5844 | systems/texlive/tlnet/archive/simplecv.source.r35537.tar.xz
-2022/12/03 |    1986672 | systems/texlive/tlnet/archive/simpleicons.doc.r65167.tar.xz
-2022/12/03 |    2707528 | systems/texlive/tlnet/archive/simpleicons.r65167.tar.xz
+2022/12/10 |    1988208 | systems/texlive/tlnet/archive/simpleicons.doc.r65229.tar.xz
+2022/12/10 |    2709564 | systems/texlive/tlnet/archive/simpleicons.r65229.tar.xz
 2019/02/28 |     224844 | systems/texlive/tlnet/archive/simpleinvoice.doc.r45673.tar.xz
 2019/02/28 |       2420 | systems/texlive/tlnet/archive/simpleinvoice.r45673.tar.xz
 2022/10/03 |     130940 | systems/texlive/tlnet/archive/simplekv.doc.r64578.tar.xz
@@ -295329,14 +295329,14 @@
 2022/02/27 |     108804 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r62206.tar.xz
 2022/02/27 |      87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r62220.tar.xz
 2022/04/21 |      69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r63092.tar.xz
-2022/12/03 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65171.tar.xz
+2022/12/10 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65231.tar.xz
 2022/03/01 |      58328 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r62282.tar.xz
 2022/02/27 |      93760 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r62206.tar.xz
 2022/02/27 |      91280 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r62210.tar.xz
 2022/02/27 |      76200 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r62220.tar.xz
 2022/02/27 |      83964 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r62206.tar.xz
-2022/12/03 |     974364 | systems/texlive/tlnet/archive/tex4ht.r65171.tar.xz
-2022/12/03 |    1285060 | systems/texlive/tlnet/archive/tex4ht.source.r65171.tar.xz
+2022/12/10 |     976252 | systems/texlive/tlnet/archive/tex4ht.r65231.tar.xz
+2022/12/10 |    1288856 | systems/texlive/tlnet/archive/tex4ht.source.r65231.tar.xz
 2022/02/28 |     184748 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r62258.tar.xz
 2022/02/27 |      57768 | systems/texlive/tlnet/archive/tex4ht.win32.r62199.tar.xz
 2022/03/01 |      58016 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r62279.tar.xz
@@ -295590,7 +295590,7 @@
 2022/09/13 |        600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz
-2022/12/09 |     423420 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65225.tar.xz
+2022/12/10 |     423416 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65227.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz
 2020/01/27 |        924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz
 2020/01/27 |        916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz
@@ -295614,7 +295614,7 @@
 2022/09/13 |        592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz
-2022/12/09 |     113628 | systems/texlive/tlnet/archive/texlive-scripts.r65225.tar.xz
+2022/12/10 |     113652 | systems/texlive/tlnet/archive/texlive-scripts.r65227.tar.xz
 2022/09/13 |        580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
 2022/11/29 |      36264 | systems/texlive/tlnet/archive/texlive-scripts.win32.r65128.tar.xz
 2022/09/13 |        596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -297465,16 +297465,16 @@
 2020/07/18 |      47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
 2020/07/18 |     101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
 2022/07/17 |     124404 | systems/texlive/tlnet/install-tl
-2022/12/09 |    5834151 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/12/09 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/12/10 |    5834240 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/12/10 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/12/09 |   20433222 | systems/texlive/tlnet/install-tl-windows.exe
-2022/12/09 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/12/09 |   25518459 | systems/texlive/tlnet/install-tl.zip
-2022/12/09 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/12/10 |   20433315 | systems/texlive/tlnet/install-tl-windows.exe
+2022/12/10 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/12/10 |   25518478 | systems/texlive/tlnet/install-tl.zip
+2022/12/10 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2022/04/03 |       1229 | systems/texlive/tlnet/README.md
 2022/04/03 |          0 | systems/texlive/tlnet/TEXLIVE_2022
 2022/02/28 |       7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -297484,7 +297484,7 @@
 2022/02/28 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2022/10/09 |      49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/12/08 |       7023 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/12/09 |       7084 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/10/13 |     225403 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
 2020/04/15 |    2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
 2017/04/16 |       2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -297527,12 +297527,12 @@
 2021/05/16 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/12/21 |       5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2021/12/21 |      27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/12/09 |   17886814 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/12/09 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/12/10 |   17886857 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/12/10 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2022/04/18 |      86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/12/09 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/12/09 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/12/09 |    2432844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/12/10 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/12/10 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/12/10 |    2431948 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2022/09/14 |      58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2022/10/04 |      42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/12/21 |      16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -302975,7 +302975,7 @@
 2022/11/01 |       5115 | systems/win32/miktex/tm/packages/filehook.tar.lzma
 2012/12/04 |     924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
 2011/09/21 |     281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/12/09 |     750275 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/12/10 |     750235 | systems/win32/miktex/tm/packages/files.csv.lzma
 2001/05/14 |       5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
 2015/10/20 |      44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
 2011/10/21 |      89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -304179,9 +304179,9 @@
 2022/11/01 |     489654 | systems/win32/miktex/tm/packages/lt3luabridge__doc.tar.lzma
 2022/11/01 |       5402 | systems/win32/miktex/tm/packages/lt3luabridge__source.tar.lzma
 2022/11/01 |       3119 | systems/win32/miktex/tm/packages/lt3luabridge.tar.lzma
-2022/11/28 |     538186 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
-2022/11/28 |      10345 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
-2022/11/28 |       3676 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
+2022/12/10 |     537281 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
+2022/12/10 |      12165 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
+2022/12/10 |       3867 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
 2014/08/19 |     236809 | systems/win32/miktex/tm/packages/ltablex.tar.lzma
 2010/03/30 |     272798 | systems/win32/miktex/tm/packages/ltabptch.tar.lzma
 2017/04/13 |      49206 | systems/win32/miktex/tm/packages/ltb2bib.tar.lzma
@@ -304757,9 +304757,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2022/07/26 |      39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2022/11/25 |      43705 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/12/09 |     306066 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/12/09 |    1858824 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/12/09 |    1629494 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/12/10 |     306083 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/12/10 |    1856763 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/12/10 |    1629440 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2022/07/26 |      13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2022/11/25 |      14427 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
 2016/07/15 |      35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -305012,102 +305012,102 @@
 2022/11/01 |     230073 | systems/win32/miktex/tm/packages/newverbs__doc.tar.lzma
 2022/11/01 |       7969 | systems/win32/miktex/tm/packages/newverbs__source.tar.lzma
 2022/11/01 |       3030 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/12/09 |     750201 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/12/09 |      57202 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/12/09 |    1167458 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/12/09 |      31724 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/12/09 |      35308 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/12/09 |      65924 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/12/09 |     101553 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/12/09 |      77603 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/12/09 |      31607 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/12/09 |     395058 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/12/09 |      37085 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/12/09 |      57980 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/12/09 |     271331 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/12/09 |     196594 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/12/09 |     103671 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/12/09 |      24083 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/12/09 |     472920 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/12/09 |      52676 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/12/09 |     327292 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/12/09 |      45777 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/12/09 |     135920 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/12/09 |    1461816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/12/09 |     121133 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/12/09 |      48990 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/12/09 |      28758 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/12/09 |      62722 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/12/09 |     156099 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/12/09 |      79794 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/12/09 |      81463 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/12/09 |     296183 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/12/09 |      25212 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/12/09 |     113053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/12/09 |      73339 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/12/09 |     115791 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/12/09 |      44066 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/12/09 |     572251 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/12/09 |     247441 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/12/09 |     175408 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/12/09 |     109783 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/12/09 |      18377 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/12/09 |      30486 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/12/09 |     702460 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/12/09 |     600004 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/12/09 |     529828 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/12/09 |     103755 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/12/09 |    1997628 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/12/09 |      73940 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/12/09 |      32317 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/12/09 |       8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/12/09 |     209119 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/12/09 |     287017 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/12/09 |     105359 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/12/09 |     140772 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/12/09 |     327066 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/12/09 |     181692 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/12/09 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/12/09 |      35217 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/12/09 |      43889 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/12/09 |      48153 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/12/09 |      52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/12/09 |     213647 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/12/09 |      41737 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/12/09 |     827106 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/12/09 |     203674 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/12/09 |     245716 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/12/09 |      88413 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/12/09 |    1337651 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/12/09 |      24022 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/12/09 |      37404 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/12/09 |      72749 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/12/09 |      58470 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/12/09 |     759319 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/12/09 |    1515183 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/12/09 |      52754 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/12/09 |      64370 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/12/09 |      27825 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/12/09 |      18484 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/12/09 |      71242 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/12/09 |     173491 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/12/09 |      69253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/12/09 |     109209 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/12/09 |    2831358 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/12/09 |      61783 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/12/09 |      42457 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/12/09 |      33922 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/12/09 |      74395 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/12/09 |     352456 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/12/09 |      57426 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/12/09 |     637670 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/12/09 |      43720 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/12/09 |     306071 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/12/09 |    1858852 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/12/09 |    1630145 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/12/09 |      14438 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/12/10 |     750201 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/12/10 |      57193 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/12/10 |    1166875 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/12/10 |      31764 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/12/10 |      35294 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/12/10 |      65862 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/12/10 |     101630 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/12/10 |      77660 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/12/10 |      31601 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/12/10 |     394909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/12/10 |      37093 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/12/10 |      57834 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/12/10 |     271337 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/12/10 |     196628 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/12/10 |     103600 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/12/10 |      24056 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/12/10 |     472949 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/12/10 |      52696 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/12/10 |     327524 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/12/10 |      45807 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/12/10 |     135904 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/12/10 |    1456967 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/12/10 |     121163 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/12/10 |      48904 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/12/10 |      28756 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/12/10 |      62760 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/12/10 |     155989 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/12/10 |      79828 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/12/10 |      81504 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/12/10 |     296170 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/12/10 |      25206 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/12/10 |     113240 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/12/10 |      73380 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/12/10 |     115703 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/12/10 |      44063 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/12/10 |     571421 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/12/10 |     247461 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/12/10 |     175407 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/12/10 |     109733 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/12/10 |      18360 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/12/10 |      30512 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/12/10 |     702353 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/12/10 |     601513 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/12/10 |     529983 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/12/10 |     103715 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/12/10 |    2003548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/12/10 |      73953 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/12/10 |      32326 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/12/10 |       8830 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/12/10 |     208997 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/12/10 |     287108 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/12/10 |     105441 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/12/10 |     140853 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/12/10 |     326704 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/12/10 |     181611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/12/10 |      55789 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/12/10 |      35210 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/12/10 |      43904 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/12/10 |      48187 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/12/10 |      52534 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/12/10 |     213527 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/12/10 |      41742 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/12/10 |     827386 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/12/10 |     203417 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/12/10 |     245747 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/12/10 |      88421 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/12/10 |    1336998 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/12/10 |      24047 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/12/10 |      37415 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/12/10 |      72797 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/12/10 |      58447 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/12/10 |     759351 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/12/10 |    1515629 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/12/10 |      52723 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/12/10 |      64357 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/12/10 |      27714 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/12/10 |      18524 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/12/10 |      71212 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/12/10 |     173477 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/12/10 |      69201 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/12/10 |     109333 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/12/10 |    2831704 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/12/10 |      61643 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/12/10 |      42474 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/12/10 |      33890 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/12/10 |      74329 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/12/10 |     352404 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/12/10 |      57426 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/12/10 |     637120 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/12/10 |      43697 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/12/10 |     306077 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/12/10 |    1856794 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/12/10 |    1629813 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/12/10 |      14445 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2019/03/12 |       1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/12/09 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/12/10 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
 2018/07/06 |     145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
 2017/03/30 |     191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
 2012/12/20 |     612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -305634,7 +305634,7 @@
 2022/02/22 |       6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
 2021/04/23 |     274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/12/09 |        900 | systems/win32/miktex/tm/packages/pr.ini
+2022/12/10 |        920 | systems/win32/miktex/tm/packages/pr.ini
 2010/09/27 |     248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
 2008/06/17 |      77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
 2017/07/12 |     988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -306247,9 +306247,9 @@
 2022/08/11 |       2863 | systems/win32/miktex/tm/packages/simplebnf.tar.lzma
 2013/03/01 |     939150 | systems/win32/miktex/tm/packages/simplecd.tar.lzma
 2014/11/20 |     300788 | systems/win32/miktex/tm/packages/simplecv.tar.lzma
-2022/12/07 |    1992712 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
-2022/12/07 |      17829 | systems/win32/miktex/tm/packages/simpleicons__source.tar.lzma
-2022/12/07 |    2732533 | systems/win32/miktex/tm/packages/simpleicons.tar.lzma
+2022/12/10 |    1994465 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
+2022/12/10 |      17883 | systems/win32/miktex/tm/packages/simpleicons__source.tar.lzma
+2022/12/10 |    2734873 | systems/win32/miktex/tm/packages/simpleicons.tar.lzma
 2017/11/03 |     228224 | systems/win32/miktex/tm/packages/simpleinvoice.tar.lzma
 2022/10/06 |     125688 | systems/win32/miktex/tm/packages/simplekv__doc.tar.lzma
 2022/10/06 |       6337 | systems/win32/miktex/tm/packages/simplekv__source.tar.lzma
@@ -307651,7 +307651,7 @@
 2014/07/05 |        611 | systems/win32/yandy/README
 2014/07/05 |    1004628 | systems/win32/yandy/yandy-src.tar.xz
 2014/07/05 |    1012416 | systems/win32/yandy.zip
-2022/12/10 |        186 | timestamp
+2022/12/11 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2022/02/28 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 7f4637e41b..3f702fedda 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index 458fcd1a02..203aced8a4 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,90 +1,224 @@
-2022/12/09 |        900 | systems/win32/miktex/tm/packages/pr.ini
-2022/12/09 |      88413 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/12/09 |       8826 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/12/09 |     827106 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/12/09 |      81463 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/12/09 |      79794 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/12/09 |      77603 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/12/09 |     759319 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/12/09 |     750275 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/12/09 |     750201 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/12/09 |      74395 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/12/09 |      73940 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/12/09 |      73339 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/12/09 |      72749 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/12/09 |      71242 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/12/09 |     702460 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/12/10 |       9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
+2022/12/10 |     976252 | systems/texlive/tlnet/archive/tex4ht.r65231.tar.xz
+2022/12/10 |       9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
+2022/12/10 |        938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
+2022/12/10 |     937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
+2022/12/10 |     929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
+2022/12/10 |        920 | systems/win32/miktex/tm/packages/pr.ini
+2022/12/10 |      88421 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/12/10 |       8830 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/12/10 |        876 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
+2022/12/10 |       8445 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+2022/12/10 |     841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
+2022/12/10 |     834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
+2022/12/10 |      83192 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+2022/12/10 |     827386 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/12/10 |      81504 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/12/10 |      79828 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/12/10 |      77660 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/12/10 |        771 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
+2022/12/10 |     759351 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/12/10 |     758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
+2022/12/10 |     751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
+2022/12/10 |     750235 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/12/10 |     750201 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/12/10 |      74329 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/12/10 |      73953 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/12/10 |      73380 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/12/10 |        728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
+2022/12/10 |      72797 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/12/10 |      71212 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/12/10 |     702353 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/12/10 |      69201 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/12/10 |       6915 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
+2022/12/10 |     690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
+2022/12/10 |     683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
+2022/12/10 |      65862 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/12/10 |     657335 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
+2022/12/10 |      64357 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/12/10 |        641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
+2022/12/10 |     637120 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/12/10 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
+2022/12/10 |        635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
+2022/12/10 |        633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
+2022/12/10 |        632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
+2022/12/10 |        631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
+2022/12/10 |      62760 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/12/10 |        626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
+2022/12/10 |      61643 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/12/10 |     615315 | install/macros/latex/contrib/nicefilelist.tds.zip
+2022/12/10 |     613713 | macros/latex/contrib/nicefilelist.zip
+2022/12/10 |     601513 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/12/10 |      58447 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/12/10 |    5834240 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/12/10 |      57834 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/12/10 |      57426 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/12/10 |      57193 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/12/10 |     571421 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/12/10 |      56360 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+2022/12/10 |        561 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
+2022/12/10 |      55789 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/12/10 |     537281 | systems/win32/miktex/tm/packages/lt3rawobjects__doc.tar.lzma
+2022/12/10 |     536804 | systems/texlive/tlnet/archive/lt3rawobjects.doc.r65230.tar.xz
+2022/12/10 |     529983 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/12/10 |      52723 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/12/10 |      52696 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/12/10 |      52534 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/12/10 |     516430 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+2022/12/10 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/12/10 |      48904 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/12/10 |      48187 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/12/10 |     472949 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/12/10 |      47166 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
+2022/12/10 |      45807 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/12/10 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/12/10 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/12/10 |      44063 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/12/10 |      43904 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/12/10 |      43697 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/12/10 |      42474 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/12/10 |     423416 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65227.tar.xz
+2022/12/10 |     422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
+2022/12/10 |        418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
+2022/12/10 |      41742 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/12/10 |     416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
+2022/12/10 |      41491 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+2022/12/10 |     403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
+2022/12/10 |    4021446 | biblio/ctan-bibdata.zip
+2022/12/10 |     394909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/12/10 |     393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
+2022/12/10 |       3901 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
+2022/12/10 |       3867 | systems/win32/miktex/tm/packages/lt3rawobjects.tar.lzma
+2022/12/10 |       3802 | graphics/pgf/contrib/circuitikz/README.md
+2022/12/10 |     377503 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+2022/12/10 |      37415 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/12/10 |       3724 | systems/texlive/tlnet/archive/lt3rawobjects.r65230.tar.xz
+2022/12/10 |      37093 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/12/10 |     364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
+2022/12/10 |    3627200 | biblio/ctan-bibdata/ctan.pdf
+2022/12/10 |       3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+2022/12/10 |      35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+2022/12/10 |      35294 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/12/10 |     352404 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/12/10 |      35210 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/12/10 |      33890 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/12/10 |      33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
+2022/12/10 |     327524 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/12/10 |     326704 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/12/10 |    3241670 | install/graphics/pgf/contrib/circuitikz.tds.zip
+2022/12/10 |      32326 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/12/10 |    3221863 | graphics/pgf/contrib/circuitikz.zip
+2022/12/10 |      31764 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/12/10 |      31601 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/12/10 |       3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
+2022/12/10 |     306083 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/12/10 |     306077 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/12/10 |      30512 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/12/10 |     296170 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/12/10 |      28756 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/12/10 |     287108 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/12/10 |    2831704 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/12/10 |     281961 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+2022/12/10 |        280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
+2022/12/10 |      27714 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/12/10 |    2748446 | biblio/ctan-bibdata/ctan.bib
+2022/12/10 |    2734873 | systems/win32/miktex/tm/packages/simpleicons.tar.lzma
+2022/12/10 |     271337 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/12/10 |    2709564 | systems/texlive/tlnet/archive/simpleicons.r65229.tar.xz
+2022/12/10 |       2578 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
+2022/12/10 |   25518478 | systems/texlive/tlnet/install-tl.zip
+2022/12/10 |      25206 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/12/10 |     247461 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/12/10 |     245747 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/12/10 |    2431948 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/12/10 |      24056 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/12/10 |      24047 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/12/10 |       2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
+2022/12/10 |     215467 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-serif.gif
+2022/12/10 |     213527 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/12/10 |     208997 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/12/10 |     208835 | macros/latex/contrib/mindflow.zip
+2022/12/10 |   20433315 | systems/texlive/tlnet/install-tl-windows.exe
+2022/12/10 |     203417 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/12/10 |     203366 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-sans.gif
+2022/12/10 |    2003548 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/12/10 |    1994465 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
+2022/12/10 |    1988208 | systems/texlive/tlnet/archive/simpleicons.doc.r65229.tar.xz
+2022/12/10 |     196628 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/12/10 |    1856794 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/12/10 |    1856763 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/12/10 |      18524 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/12/10 |      18360 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/12/10 |     181611 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/12/10 |   17886857 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/12/10 |      17883 | systems/win32/miktex/tm/packages/simpleicons__source.tar.lzma
+2022/12/10 |      17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+2022/12/10 |     175407 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/12/10 |     173477 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/12/10 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/12/10 |      16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+2022/12/10 |    1629813 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/12/10 |    1629440 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/12/10 |    1629420 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+2022/12/10 |       1583 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
+2022/12/10 |     155989 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/12/10 |      15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+2022/12/10 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/12/10 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/12/10 |    1515629 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/12/10 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/12/10 |      14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
+2022/12/10 |    1456967 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/12/10 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/12/10 |      14445 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/12/10 |     140853 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/12/10 |      13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+2022/12/10 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65231.tar.xz
+2022/12/10 |     135904 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/12/10 |    1336998 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/12/10 |    1288856 | systems/texlive/tlnet/archive/tex4ht.source.r65231.tar.xz
+2022/12/10 |      12165 | systems/win32/miktex/tm/packages/lt3rawobjects__source.tar.lzma
+2022/12/10 |     121163 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/12/10 |      11808 | systems/texlive/tlnet/archive/lt3rawobjects.source.r65230.tar.xz
+2022/12/10 |    1166875 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/12/10 |     115703 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/12/10 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/12/10 |     113652 | systems/texlive/tlnet/archive/texlive-scripts.r65227.tar.xz
+2022/12/10 |     113240 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/12/10 |     112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
+2022/12/10 |     109733 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/12/10 |     109333 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/12/10 |    1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
+2022/12/10 |    1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
+2022/12/10 |       1072 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/LICENSE
+2022/12/10 |    1055235 | macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles.zip
+2022/12/10 |     105441 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/12/10 |     103715 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/12/10 |     103600 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/12/10 |    1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
+2022/12/10 |     101630 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/12/10 |    1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
+2022/12/09 |       8411 | support/TeX4ht/source/mktex4ht-cnf.tex
+2022/12/09 |       7084 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/12/09 |     699480 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.pdf
-2022/12/09 |      69253 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
 2022/12/09 |       6898 | systems/win32/miktex/tm/packages/pixelart.tar.lzma
 2022/12/09 |        665 | fonts/simpleicons/README.md
-2022/12/09 |      65924 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/12/09 |      64370 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
 2022/12/09 |     643617 | systems/win32/miktex/tm/packages/digestif.tar.lzma
 2022/12/09 |        640 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsOneZero.tfm
-2022/12/09 |     637670 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/12/09 |      62722 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
 2022/12/09 |      62468 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.dtx
-2022/12/09 |      61783 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/12/09 |     621798 | support/TeX4ht/source/tex4ht-html4.tex
 2022/12/09 |      60198 | systems/win32/miktex/tm/packages/cjk.tar.lzma
-2022/12/09 |     600004 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/12/09 |      58470 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/12/09 |    5834151 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/12/09 |      57980 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/12/09 |      57426 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/12/09 |     572251 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/12/09 |      57202 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
 2022/12/09 |     567750 | macros/latex/contrib/lt3rawobjects.zip
-2022/12/09 |      55803 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/12/09 |     529828 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/12/09 |      52754 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/12/09 |      52676 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/12/09 |      52524 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
 2022/12/09 |    4939774 | fonts/simpleicons.zip
-2022/12/09 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/12/09 |      48990 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
 2022/12/09 |     487249 | systems/win32/miktex/tm/packages/digestif__source.tar.lzma
-2022/12/09 |      48153 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/12/09 |     472920 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/12/09 |      45777 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/12/09 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/12/09 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2022/12/09 |      44066 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/12/09 |      43889 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/12/09 |      43720 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/12/09 |      42457 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/12/09 |     423420 | systems/texlive/tlnet/archive/texlive-scripts.doc.r65225.tar.xz
-2022/12/09 |      41737 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/12/09 |    4020414 | biblio/ctan-bibdata.zip
-2022/12/09 |     395058 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/12/09 |      37404 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/12/09 |      37085 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/12/09 |    3627112 | biblio/ctan-bibdata/ctan.pdf
-2022/12/09 |      35308 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/12/09 |     352456 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/12/09 |      35217 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
 2022/12/09 |       3401 | systems/win32/miktex/tm/packages/digestif__doc.tar.lzma
-2022/12/09 |      33922 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/12/09 |     327292 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/12/09 |     327066 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/12/09 |      32317 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/12/09 |      31724 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/12/09 |      31607 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/12/09 |     306071 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/12/09 |     306066 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/12/09 |      30486 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/12/09 |     296183 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/12/09 |      28758 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/12/09 |     287017 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
 2022/12/09 |       2842 | fonts/simpleicons/enc/simpleiconsOne.enc
-2022/12/09 |    2831358 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/12/09 |      27825 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
 2022/12/09 |        274 | fonts/simpleicons/tex/usimpleiconsOneZero.fd
-2022/12/09 |    2748449 | biblio/ctan-bibdata/ctan.bib
 2022/12/09 |       2746 | fonts/simpleicons/enc/simpleiconsFour.enc
-2022/12/09 |     271331 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
 2022/12/09 |       2673 | fonts/simpleicons/enc/simpleiconsSix.enc
 2022/12/09 |       2660 | fonts/simpleicons/enc/simpleiconsEight.enc
 2022/12/09 |        264 | fonts/simpleicons/tex/usimpleiconsThree.fd
@@ -96,56 +230,22 @@
 2022/12/09 |        259 | fonts/simpleicons/tex/usimpleiconsFour.fd
 2022/12/09 |        259 | fonts/simpleicons/tex/usimpleiconsFive.fd
 2022/12/09 |       2575 | fonts/simpleicons/enc/simpleiconsNine.enc
-2022/12/09 |   25518459 | systems/texlive/tlnet/install-tl.zip
 2022/12/09 |        254 | fonts/simpleicons/tex/usimpleiconsTwo.fd
 2022/12/09 |        254 | fonts/simpleicons/tex/usimpleiconsSix.fd
 2022/12/09 |        254 | fonts/simpleicons/tex/usimpleiconsOne.fd
-2022/12/09 |      25212 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
 2022/12/09 |       2503 | fonts/simpleicons/enc/simpleiconsThree.enc
-2022/12/09 |     247441 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/12/09 |     245716 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/12/09 |    2432844 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2022/12/09 |       2425 | fonts/simpleicons/enc/simpleiconsFive.enc
-2022/12/09 |      24083 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/12/09 |      24022 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
 2022/12/09 |       2364 | fonts/simpleicons/enc/simpleiconsOneZero.enc
 2022/12/09 |     229955 | systems/win32/miktex/tm/packages/cjk__source.tar.lzma
 2022/12/09 |       2242 | macros/latex/contrib/lt3rawobjects/lt3rawobjects.ins
 2022/12/09 |     216649 | fonts/simpleicons/tex/simpleiconsglyphs-pdftex.tex
-2022/12/09 |     213647 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
 2022/12/09 |     212601 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
-2022/12/09 |     209119 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/12/09 |   20433222 | systems/texlive/tlnet/install-tl-windows.exe
-2022/12/09 |     203674 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/12/09 |    1997628 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/12/09 |     211044 | support/TeX4ht/source/ChangeLog
 2022/12/09 |    1978740 | fonts/simpleicons/doc/simpleicons.pdf
-2022/12/09 |     196594 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2022/12/09 |    1875904 | fonts/simpleicons/opentype/SimpleIcons.otf
-2022/12/09 |    1858852 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/12/09 |    1858824 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/12/09 |      18484 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
 2022/12/09 |       1844 | fonts/simpleicons/doc/simpleicons.tex
-2022/12/09 |      18377 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/12/09 |     181692 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/12/09 |   17886814 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/12/09 |     175408 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
 2022/12/09 |    1747805 | fonts/simpleicons/type1/SimpleIcons.pfb
-2022/12/09 |     173491 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/12/09 |       1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
-2022/12/09 |    1630145 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/12/09 |    1629494 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/12/09 |     156099 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
 2022/12/09 |       1557 | fonts/simpleicons/tex/simpleicons.sty
-2022/12/09 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/12/09 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/12/09 |    1515183 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/12/09 |    1461816 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/12/09 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/12/09 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/12/09 |      14438 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/12/09 |     140772 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/12/09 |     135920 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/12/09 |    1337651 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
 2022/12/09 |      13280 | systems/win32/miktex/tm/packages/pixelart__source.tar.lzma
 2022/12/09 |       1305 | macros/latex/contrib/lt3rawobjects/README.md
 2022/12/09 |     128556 | fonts/simpleicons/doc/bindings.tex
@@ -158,25 +258,14 @@
 2022/12/09 |       1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsFive.tfm
 2022/12/09 |       1232 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsEight.tfm
 2022/12/09 |       1228 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsOne.tfm
-2022/12/09 |     121133 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/12/09 |    1167458 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/12/09 |     115791 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/12/09 |       1150 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/12/09 |     113628 | systems/texlive/tlnet/archive/texlive-scripts.r65225.tar.xz
-2022/12/09 |     113053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/12/09 |  115563634 | macros/context/latest/cont-tmf.zip
+2022/12/09 |    1151095 | support/TeX4ht/source/tex4ht-4ht.tex
 2022/12/09 |       1119 | fonts/simpleicons/map/simpleicons.map
-2022/12/09 |     109783 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/12/09 |     109209 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/12/09 |     105359 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/12/09 |     103755 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/12/09 |     103671 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/12/09 |     101553 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
 2022/12/08 |      93496 | systems/texlive/tlnet/archive/jourcl.doc.r65221.tar.xz
 2022/12/08 |       7626 | systems/win32/miktex/tm/packages/dtxdescribe.tar.lzma
 2022/12/08 |      75334 | systems/win32/miktex/tm/packages/jourcl__doc.tar.lzma
 2022/12/08 |       7497 | systems/win32/miktex/tm/packages/hfutexam__source.tar.lzma
 2022/12/08 |       7436 | systems/texlive/tlnet/archive/dtxdescribe.r65223.tar.xz
-2022/12/08 |       7023 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2022/12/08 |       6772 | systems/texlive/tlnet/archive/eolang.r65223.tar.xz
 2022/12/08 |     637308 | systems/texlive/tlnet/archive/digestif.r65223.tar.xz
 2022/12/08 |       5560 | systems/texlive/tlnet/archive/digestif.doc.r65223.tar.xz
@@ -288,7 +377,6 @@
 2022/12/07 |   28200483 | systems/win32/miktex/tm/packages/cjk-fonts.tar.lzma
 2022/12/07 |     281333 | systems/win32/miktex/tm/packages/csbulletin__doc.tar.lzma
 2022/12/07 |       2771 | systems/win32/miktex/tm/packages/datetime2-icelandic.tar.lzma
-2022/12/07 |    2732533 | systems/win32/miktex/tm/packages/simpleicons.tar.lzma
 2022/12/07 |       2694 | systems/win32/miktex/tm/packages/graphics-pln__doc.tar.lzma
 2022/12/07 |     266115 | systems/win32/miktex/tm/packages/latex-firstaid-dev__doc.tar.lzma
 2022/12/07 |      25795 | systems/win32/miktex/tm/packages/pdfextra.tar.lzma
@@ -308,12 +396,10 @@
 2022/12/07 |     205310 | macros/latex/contrib/hfutexam/hfutexam.pdf
 2022/12/07 |      20149 | support/digestif/digestif/util.lua
 2022/12/07 |      20131 | macros/latex/contrib/jourcl/LICENSE
-2022/12/07 |    1992712 | systems/win32/miktex/tm/packages/simpleicons__doc.tar.lzma
 2022/12/07 |     197346 | systems/win32/miktex/tm/packages/setspace__doc.tar.lzma
 2022/12/07 |      19623 | systems/win32/miktex/tm/packages/njuthesis.tar.lzma
 2022/12/07 |      18223 | support/digestif/data/amsrefs.sty.tags
 2022/12/07 |      17933 | systems/win32/miktex/tm/packages/biblatex-publist__source.tar.lzma
-2022/12/07 |      17829 | systems/win32/miktex/tm/packages/simpleicons__source.tar.lzma
 2022/12/07 |      17316 | systems/win32/miktex/tm/packages/amiri__source.tar.lzma
 2022/12/07 |      17246 | systems/win32/miktex/tm/packages/univie-ling__source.tar.lzma
 2022/12/07 |       1714 | systems/win32/miktex/tm/packages/setspace__source.tar.lzma
@@ -337,7 +423,6 @@
 2022/12/07 |    1172460 | systems/win32/miktex/tm/packages/njuthesis__doc.tar.lzma
 2022/12/07 |     117063 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
 2022/12/07 |      11638 | support/digestif/digestif/data.lua
-2022/12/07 |  115557553 | macros/context/latest/cont-tmf.zip
 2022/12/07 |       1150 | support/digestif/data/hyperref.sty.tags
 2022/12/07 |       1136 | support/digestif/digestif/ManuscriptBibTeX.lua
 2022/12/07 |    1122677 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
@@ -410,10 +495,12 @@
 2022/12/06 |      24919 | macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
 2022/12/06 |      24366 | macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
 2022/12/06 |       2258 | macros/latex/contrib/univie-ling/doc/templates/template-wlg-article.tex
+2022/12/06 |      21554 | macros/latex/contrib/mindflow/mindflow.dtx
 2022/12/06 |      21544 | macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
 2022/12/06 |      21356 | systems/texlive/tlnet/archive/mathfont.r65205.tar.xz
 2022/12/06 |     200633 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.pdf
 2022/12/06 |     200629 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.pdf
+2022/12/06 |     199947 | macros/latex/contrib/mindflow/mindflow.pdf
 2022/12/06 |     196928 | systems/texlive/tlnet/archive/setspace.doc.r65206.tar.xz
 2022/12/06 |     189870 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.pdf
 2022/12/06 |     186018 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-english.pdf
@@ -448,10 +535,13 @@
 2022/12/05 |       6295 | macros/latex/contrib/lineno/doc/CHANGEs.txt
 2022/12/05 |     617754 | macros/latex/contrib/siunitx/siunitx-code.pdf
 2022/12/05 |       6021 | macros/latex/contrib/lineno/README.md
+2022/12/05 |     599529 | macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
 2022/12/05 |       5481 | macros/latex/contrib/siunitx/siunitx-locale.dtx
 2022/12/05 |      54342 | macros/latex/contrib/mathfont/mathfont_example_roboto.pdf
 2022/12/05 |      51383 | macros/latex/contrib/siunitx/siunitx-table.dtx
 2022/12/05 |      51296 | macros/latex/contrib/mathfont/mathfont_example_cormorant.pdf
+2022/12/05 |         50 | macros/latex/contrib/nicefilelist/source/wrong.prv
+2022/12/05 |        492 | macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
 2022/12/05 |      48016 | macros/latex/contrib/lineno/tex/fnlineno.sty
 2022/12/05 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
 2022/12/05 |      47388 | macros/latex/contrib/mathfont/mathfont_example_typey.pdf
@@ -477,11 +567,15 @@
 2022/12/05 |       2354 | macros/latex/contrib/setspace/setspace-doc.tex
 2022/12/05 |      22490 | macros/latex/contrib/setspace/setspace.sty
 2022/12/05 |      21684 | macros/latex/contrib/siunitx/siunitx.dtx
+2022/12/05 |       2104 | macros/latex/contrib/nicefilelist/README
+2022/12/05 |        206 | macros/latex/contrib/nicefilelist/source/provonly.fd
 2022/12/05 |     203454 | macros/latex/contrib/setspace.zip
 2022/12/05 |     198366 | macros/latex/contrib/lineno/doc/fnlineno.pdf
 2022/12/05 |     197440 | macros/latex/contrib/setspace/setspace-doc.pdf
 2022/12/05 |     186433 | macros/latex/contrib/mathfont/mathfont_symbol_list.pdf
+2022/12/05 |      17436 | macros/latex/contrib/nicefilelist/source/nicefilelist.tex
 2022/12/05 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2022/12/05 |      16838 | macros/latex/contrib/nicefilelist/tex/nicefilelist.sty
 2022/12/05 |      16709 | macros/latex/contrib/siunitx/siunitx-angle.dtx
 2022/12/05 |       1623 | macros/latex/contrib/hfutexam/hfutexam_datizhi.tex
 2022/12/05 |     161169 | macros/latex/contrib/lineno/doc/lnosuppl.pdf
@@ -491,7 +585,9 @@
 2022/12/05 |    1514621 | install/macros/latex/contrib/siunitx.tds.zip
 2022/12/05 |     147312 | macros/latex/contrib/siunitx/siunitx-number.dtx
 2022/12/05 |    1470351 | macros/latex/contrib/siunitx.zip
+2022/12/05 |       1451 | macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
 2022/12/05 |     127130 | macros/latex/contrib/lineno/doc/ulineno.pdf
+2022/12/05 |       1225 | macros/latex/contrib/nicefilelist/source/srcfiles.tex
 2022/12/05 |      12067 | macros/latex/contrib/lineno/source/linenoamsmathdemo.tex
 2022/12/05 |     115613 | macros/latex/contrib/mathfont/mathfont_user_guide.pdf
 2022/12/05 |     113295 | macros/latex/contrib/lineno/source/lineno.tex
@@ -499,6 +595,7 @@
 2022/12/05 |      10812 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
 2022/12/05 |    1061956 | systems/texlive/tlnet/archive/kpathsea.doc.r65200.tar.xz
 2022/12/05 |     103909 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2022/12/05 |          0 | macros/latex/contrib/nicefilelist/source/empty.f
 2022/12/04 |       9843 | support/latexindent/LatexIndent/Lines.pm
 2022/12/04 |      94352 | macros/latex/contrib/ppt-slides/socrates.jpg
 2022/12/04 |     932594 | macros/latex/contrib/ppt-slides/ppt-slides.pdf
@@ -631,351 +728,3 @@
 2022/12/04 |    1038670 | fonts/amiri.zip
 2022/12/04 |    1030676 | systems/texlive/tlnet/archive/bithesis.doc.r65195.tar.xz
 2022/12/04 |    1018762 | macros/latex/contrib/ppt-slides.zip
-2022/12/03 |         99 | macros/latex-dev/base/ltpara-code.tex
-2022/12/03 |        998 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
-2022/12/03 |       9926 | macros/latex-dev/base/ltnews21.tex
-2022/12/03 |       9779 | macros/latex-dev/base/format.ins
-2022/12/03 |     974364 | systems/texlive/tlnet/archive/tex4ht.r65171.tar.xz
-2022/12/03 |       9729 | macros/luatex/generic/pdfextra/pdfextra.tex
-2022/12/03 |         96 | macros/latex-dev/base/doc-code.tex
-2022/12/03 |       9600 | macros/luatex/generic/pdfextra/examples/pdfextra-example.tex
-2022/12/03 |       9557 | macros/latex-dev/base/ltcntrl.dtx
-2022/12/03 |       9401 | macros/latex-dev/base/source2edoc.cls
-2022/12/03 |       9395 | macros/latex-dev/base/syntonly.dtx
-2022/12/03 |       9345 | macros/latex-dev/base/preload.dtx
-2022/12/03 |      92954 | macros/latex-dev/base/ltdefns.dtx
-2022/12/03 |      92280 | macros/latex-dev/base/utf8ienc.dtx
-2022/12/03 |       9068 | macros/latex-dev/base/lppl-1-0.txt
-2022/12/03 |      90660 | macros/latex-dev/base/lttextcomp.dtx
-2022/12/03 |      89727 | macros/latex-dev/base/slides.dtx
-2022/12/03 |       8970 | macros/latex-dev/base/ltnews17.tex
-2022/12/03 |       8827 | macros/latex/contrib/biblatex-contrib/biblatex-publist/README
-2022/12/03 |       8731 | macros/latex-dev/base/ltthm.dtx
-2022/12/03 |       8626 | macros/latex-dev/base/oldlfont.dtx
-2022/12/03 |      84215 | macros/latex-dev/base/ltfssini.dtx
-2022/12/03 |       8367 | macros/latex-dev/base/ltnews.tex
-2022/12/03 |      82481 | macros/latex-dev/base/ltfssbas.dtx
-2022/12/03 |     820928 | macros/latex-dev/base/ltshipout-code.pdf
-2022/12/03 |      81202 | macros/latex-dev/base/ltshipout.dtx
-2022/12/03 |     803060 | macros/latex-dev/base/ltfilehook-code.pdf
-2022/12/03 |     755547 | macros/latex-dev/base/doc.pdf
-2022/12/03 |       7524 | macros/latex-dev/base/ltxguide.cls
-2022/12/03 |      75111 | macros/latex-dev/base/ltfssdcl.dtx
-2022/12/03 |      74886 | macros/latex-dev/base/ltluatex.dtx
-2022/12/03 |       7376 | systems/texlive/tlnet/archive/cvss.source.r65169.tar.xz
-2022/12/03 |      72475 | macros/latex-dev/base/ltfsstrc.dtx
-2022/12/03 |       7235 | macros/luatex/generic/pdfextra/examples/pdfextra-example-latex.tex
-2022/12/03 |       7221 | macros/latex-dev/base/ltnews20.tex
-2022/12/03 |       7216 | macros/latex-dev/base/exscale.dtx
-2022/12/03 |       7200 | macros/latex-dev/base/sample2e.tex
-2022/12/03 |     719408 | macros/latex-dev/base/ltcmdhooks-code.pdf
-2022/12/03 |     715658 | macros/latex-dev/base/ltmarks-code.pdf
-2022/12/03 |       7104 | macros/latex-dev/base/alltt.dtx
-2022/12/03 |       7029 | macros/latex-dev/base/ltnews13.tex
-2022/12/03 |     702657 | macros/luatex/generic/pdfextra.zip
-2022/12/03 |     701473 | macros/latex-dev/base/lthooks-doc.pdf
-2022/12/03 |         69 | macros/luatex/generic/pdfextra/pdfextra.sty
-2022/12/03 |      69315 | macros/latex-dev/base/clsguide.tex
-2022/12/03 |      69143 | macros/luatex/generic/pdfextra/pdfextra.opm
-2022/12/03 |      69002 | macros/latex-dev/base/ltpictur.dtx
-2022/12/03 |      68732 | macros/latex-dev/base/usrguide-historic.tex
-2022/12/03 |       6760 | macros/latex-dev/base/slides.ins
-2022/12/03 |      67351 | macros/latex-dev/base/ltfilehook.dtx
-2022/12/03 |       6709 | macros/latex-dev/base/latexsym.dtx
-2022/12/03 |     667129 | macros/latex-dev/base/ltpara-code.pdf
-2022/12/03 |        662 | macros/luatex/generic/pdfextra/LICENSE
-2022/12/03 |       6424 | macros/latex-dev/base/ltnews14.tex
-2022/12/03 |      63700 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
-2022/12/03 |       6357 | macros/latex-dev/base/newlfont.dtx
-2022/12/03 |      63280 | macros/latex-dev/base/letter.dtx
-2022/12/03 |      63132 | macros/latex-dev/base/ltmarks.dtx
-2022/12/03 |       6213 | macros/latex-dev/base/ltmeta.dtx
-2022/12/03 |       6155 | macros/latex-dev/base/ltpar.dtx
-2022/12/03 |      60516 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
-2022/12/03 |       6047 | macros/latex-dev/base/latexrelease.ins
-2022/12/03 |      60321 | macros/latex-dev/base/fontdef.dtx
-2022/12/03 |       5986 | macros/latex-dev/base/ltnews15.tex
-2022/12/03 |      59499 | macros/latex-dev/base/ltplain.dtx
-2022/12/03 |      59070 | macros/latex-dev/base/ltmiscen.dtx
-2022/12/03 |      58933 | macros/latex-dev/base/ltfiles.dtx
-2022/12/03 |     586024 | macros/latex-dev/base/ltmarks-doc.pdf
-2022/12/03 |       5859 | macros/latex-dev/base/ltidxglo.dtx
-2022/12/03 |      58592 | macros/luatex/generic/pdfextra/examples/pdfextra-example-part.prc
-2022/12/03 |      58551 | macros/latex-dev/base/ltfssaxes.dtx
-2022/12/03 |       5825 | macros/latex-dev/base/ltnews10.tex
-2022/12/03 |    5789493 | macros/latex-dev/base/source2e.pdf
-2022/12/03 |       5775 | macros/latex-dev/base/ltnews16.tex
-2022/12/03 |     574872 | systems/texlive/tlnet/archive/cvss.doc.r65169.tar.xz
-2022/12/03 |       5732 | macros/latex-dev/base/ltnews08.tex
-2022/12/03 |       5714 | macros/latex-dev/base/inputenc.ins
-2022/12/03 |       5699 | macros/latex-dev/base/ltnews05.tex
-2022/12/03 |       5678 | macros/latex-dev/base/ltnews04.tex
-2022/12/03 |       5671 | macros/latex-dev/base/ltnews27.tex
-2022/12/03 |     565931 | macros/latex-dev/base/ltshipout-doc.pdf
-2022/12/03 |     563089 | macros/latex-dev/base/ltnews35.pdf
-2022/12/03 |     560326 | macros/latex-dev/base/classes.pdf
-2022/12/03 |     560008 | macros/latex-dev/base/ltpara-doc.pdf
-2022/12/03 |       5588 | macros/latex-dev/base/ltnews25.tex
-2022/12/03 |       5576 | macros/latex-dev/base/ltnews07.tex
-2022/12/03 |       5574 | macros/latex-dev/base/ltnews12.tex
-2022/12/03 |      55687 | macros/latex-dev/base/ltfloat.dtx
-2022/12/03 |       5544 | macros/latex-dev/base/ltnews06.tex
-2022/12/03 |       5529 | macros/latex-dev/base/ltnews11.tex
-2022/12/03 |       5509 | macros/latex-dev/base/graphpap.dtx
-2022/12/03 |     547926 | macros/latex-dev/base/ltfilehook-doc.pdf
-2022/12/03 |       5462 | macros/latex-dev/base/ltnews02.tex
-2022/12/03 |     546160 | macros/latex-dev/base/ltnews32.pdf
-2022/12/03 |     545808 | systems/texlive/tlnet/archive/ffcode.doc.r65170.tar.xz
-2022/12/03 |       5451 | macros/latex-dev/base/ltnews09.tex
-2022/12/03 |       5369 | macros/latex-dev/base/ltnews03.tex
-2022/12/03 |      53025 | macros/latex-dev/base/ltcmdhooks.dtx
-2022/12/03 |      52813 | macros/latex-dev/base/encguide.tex
-2022/12/03 |       5273 | macros/latex-dev/base/cmextra.ins
-2022/12/03 |      52710 | macros/latex-dev/base/lb2.err
-2022/12/03 |     526323 | macros/latex-dev/base/ltnews31.pdf
-2022/12/03 |       5246 | macros/latex-dev/base/ltnews01.tex
-2022/12/03 |     522412 | macros/latex-dev/base/ltnews33.pdf
-2022/12/03 |     517838 | macros/latex-dev/base/fntguide.pdf
-2022/12/03 |     517565 | macros/latex-dev/base/ltnews36.pdf
-2022/12/03 |      51606 | macros/latex-dev/base/ltpara.dtx
-2022/12/03 |     511909 | macros/latex-dev/base/ltnews30.pdf
-2022/12/03 |      51005 | macros/latex-dev/base/usrguide.tex
-2022/12/03 |     508044 | macros/latex-dev/base/ltnews34.pdf
-2022/12/03 |       5041 | macros/latex-dev/base/latexsym.ins
-2022/12/03 |     504178 | macros/latex-dev/base/docstrip.pdf
-2022/12/03 |       5016 | systems/texlive/tlnet/archive/ffcode.source.r65170.tar.xz
-2022/12/03 |      50069 | macros/latex-dev/base/ltfinal.dtx
-2022/12/03 |       4945 | macros/latex-dev/base/lthyphen.dtx
-2022/12/03 |      47896 | macros/latex-dev/base/lttab.dtx
-2022/12/03 |     478686 | macros/latex-dev/base/ltcmdhooks-doc.pdf
-2022/12/03 |       4757 | macros/latex-dev/base/ltlength.dtx
-2022/12/03 |        474 | macros/latex-dev/required/firstaid/README.md
-2022/12/03 |     474808 | macros/latex-dev/base/usrguide.pdf
-2022/12/03 |       4736 | macros/latex/contrib/semantex/stripsemantex.sty
-2022/12/03 |       4607 | macros/latex-dev/required/firstaid/changes.txt
-2022/12/03 |      45754 | macros/latex-dev/base/ltspace.dtx
-2022/12/03 |      45712 | macros/latex-dev/base/ltboxes.dtx
-2022/12/03 |     455242 | macros/latex/contrib/semantex.zip
-2022/12/03 |     455107 | macros/latex-dev/base/ltnews29.pdf
-2022/12/03 |      45347 | macros/latex-dev/base/latexrelease.dtx
-2022/12/03 |     453396 | fonts/amiri/Amiri-Regular.ttf
-2022/12/03 |     451684 | fonts/amiri/Amiri-Italic.ttf
-2022/12/03 |      44410 | macros/latex-dev/base/cmfonts.fdd
-2022/12/03 |     439953 | macros/latex/contrib/biblatex-contrib/biblatex-publist.zip
-2022/12/03 |       4390 | macros/latex-dev/base/ec.ins
-2022/12/03 |       4387 | fonts/amiri/OFL.txt
-2022/12/03 |     438515 | macros/latex-dev/base/usrguide-historic.pdf
-2022/12/03 |       4324 | macros/latex-dev/base/cmfonts.ins
-2022/12/03 |       4298 | macros/latex-dev/base/ltalloc.dtx
-2022/12/03 |     429088 | fonts/amiri/Amiri-Bold.ttf
-2022/12/03 |       4273 | macros/latex-dev/base/docstrip.ins
-2022/12/03 |      42708 | macros/latex-dev/base/changes.old.txt
-2022/12/03 |     426584 | fonts/amiri/Amiri-BoldItalic.ttf
-2022/12/03 |       4254 | macros/latex-dev/base/newdc.ins
-2022/12/03 |       4219 | macros/latex-dev/base/latex209.ins
-2022/12/03 |       4170 | macros/latex-dev/base/ltnews19.tex
-2022/12/03 |      41493 | macros/latex-dev/base/ltmath.dtx
-2022/12/03 |     414419 | macros/latex-dev/base/clsguide.pdf
-2022/12/03 |     408962 | macros/latex-dev/base/ltnews37.pdf
-2022/12/03 |       4087 | macros/latex-dev/base/classes.ins
-2022/12/03 |       4079 | macros/latex-dev/base/lablst.tex
-2022/12/03 |     407279 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
-2022/12/03 |     397760 | macros/latex/contrib/semantex/semantex.pdf
-2022/12/03 |       3960 | macros/latex-dev/base/olddc.ins
-2022/12/03 |   39466146 | install/macros/latex-dev/latex-base-dev.tds.zip
-2022/12/03 |     394640 | macros/latex-dev/base/changes.txt
-2022/12/03 |   38914585 | macros/latex-dev/base.zip
-2022/12/03 |      38793 | macros/latex-dev/base/ltnews35.tex
-2022/12/03 |      38730 | macros/latex-dev/base/latex209.dtx
-2022/12/03 |     385337 | macros/luatex/generic/pdfextra/examples/pdfextra-example.pdf
-2022/12/03 |      38033 | macros/latex-dev/base/ltnews18.pdf
-2022/12/03 |     379462 | macros/latex-dev/base/ltnews26.pdf
-2022/12/03 |       3781 | macros/latex-dev/base/tulm.ins
-2022/12/03 |     376643 | macros/latex-dev/base/ltnews28.pdf
-2022/12/03 |     375518 | macros/latex-dev/base/slides.pdf
-2022/12/03 |       3725 | macros/latex-dev/base/ltlogos.dtx
-2022/12/03 |      36152 | macros/latex-dev/base/ltlists.dtx
-2022/12/03 |      35984 | macros/latex-dev/base/ltdirchk.dtx
-2022/12/03 |     353428 | macros/latex-dev/base/utf8ienc.pdf
-2022/12/03 |       3478 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
-2022/12/03 |       3434 | macros/latex-dev/base/makeindx.ins
-2022/12/03 |      34273 | fonts/amiri/NEWS-Arabic.md
-2022/12/03 |       3401 | macros/latex-dev/base/proc.ins
-2022/12/03 |      33962 | macros/luatex/generic/pdfextra/pdfextra-doc.tex
-2022/12/03 |      33946 | macros/latex-dev/base/ltsect.dtx
-2022/12/03 |      33907 | macros/latex-dev/base/ltnews33.tex
-2022/12/03 |     337430 | macros/latex-dev/base/letter.pdf
-2022/12/03 |       3372 | macros/latex-dev/base/letter.ins
-2022/12/03 |       3367 | macros/latex-dev/base/ltoutenc.ins
-2022/12/03 |       3338 | macros/latex-dev/base/exscale.ins
-2022/12/03 |      33239 | macros/latex-dev/base/ltnews32.tex
-2022/12/03 |       3320 | systems/texlive/tlnet/archive/cvss.r65169.tar.xz
-2022/12/03 |       3282 | macros/latex-dev/base/bugs.txt
-2022/12/03 |     324910 | macros/latex-dev/base/ltluatex.pdf
-2022/12/03 |      32307 | macros/latex-dev/base/ltnews34.tex
-2022/12/03 |     318548 | macros/latex-dev/base/ltnews20.pdf
-2022/12/03 |     318204 | macros/latex-dev/base/inputenc.pdf
-2022/12/03 |       3181 | macros/latex-dev/base/unpack.ins
-2022/12/03 |     317773 | macros/latex-dev/base/ltnews22.pdf
-2022/12/03 |       3100 | macros/latex-dev/base/README.md
-2022/12/03 |       3094 | macros/unicodetex/latex/njuthesis/njuthesis.ins
-2022/12/03 |      30499 | macros/latex-dev/base/doc-2021-06-01.sty
-2022/12/03 |      30428 | macros/latex-dev/base/ltnews31.tex
-2022/12/03 |     300363 | macros/latex/contrib/semantex/semantex.sty
-2022/12/03 |     300296 | macros/unicodetex/latex/njuthesis/njuthesis.dtx
-2022/12/03 |      29965 | macros/latex-dev/base/doc-2016-02-15.sty
-2022/12/03 |      29267 | macros/latex-dev/base/ltfntcmd.dtx
-2022/12/03 |     292160 | macros/latex-dev/base/cmfonts.pdf
-2022/12/03 |     290615 | macros/latex-dev/base/tlc2.pdf
-2022/12/03 |       2896 | macros/latex-dev/base/syntonly.ins
-2022/12/03 |       2893 | macros/latex-dev/base/nfssfont.ins
-2022/12/03 |       2892 | macros/latex-dev/base/graphpap.ins
-2022/12/03 |       2892 | macros/latex-dev/base/fix-cm.ins
-2022/12/03 |       2890 | macros/latex-dev/base/alltt.ins
-2022/12/03 |       2888 | macros/latex-dev/base/ifthen.ins
-2022/12/03 |     287733 | macros/latex-dev/base/fix-cm.pdf
-2022/12/03 |     286591 | macros/latex-dev/base/ltnews23.pdf
-2022/12/03 |     282532 | systems/texlive/tlnet/archive/csbulletin.doc.r65168.tar.xz
-2022/12/03 |     282115 | macros/latex-dev/base/latexrelease.pdf
-2022/12/03 |     277960 | install/macros/latex-dev/required/latex-firstaid-dev.tds.zip
-2022/12/03 |       2740 | macros/latex-dev/required/firstaid/firstaid.ins
-2022/12/03 |     272901 | macros/latex-dev/required/firstaid.zip
-2022/12/03 |       2728 | macros/latex-dev/base/ltpageno.dtx
-2022/12/03 |     271476 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.pdf
-2022/12/03 |      27122 | macros/latex-dev/base/ltxcheck.tex
-2022/12/03 |    2707528 | systems/texlive/tlnet/archive/simpleicons.r65167.tar.xz
-2022/12/03 |      27069 | macros/latex-dev/base/lterror.dtx
-2022/12/03 |       2705 | macros/latex-dev/base/idx.tex
-2022/12/03 |     265279 | macros/latex-dev/base/ltnews24.pdf
-2022/12/03 |     264112 | macros/latex-dev/base/cfgguide.pdf
-2022/12/03 |     257804 | macros/latex-dev/base/modguide.pdf
-2022/12/03 |     257314 | macros/latex-dev/base/cyrguide.pdf
-2022/12/03 |      25560 | fonts/amiri/NEWS.md
-2022/12/03 |     252140 | macros/latex-dev/base/lb2.pdf
-2022/12/03 |     250592 | macros/latex-dev/base/ltnews27.pdf
-2022/12/03 |    2488994 | macros/optex.zip
-2022/12/03 |     244867 | macros/latex-dev/base/ltnews21.pdf
-2022/12/03 |     243286 | macros/latex-dev/base/ltxdoc.pdf
-2022/12/03 |      24286 | macros/latex-dev/base/ltcounts.dtx
-2022/12/03 |     242468 | macros/latex-dev/base/doc.dtx
-2022/12/03 |        241 | macros/latex-dev/base/ltfilehook-doc.tex
-2022/12/03 |        240 | macros/latex-dev/base/ltshipout-doc.tex
-2022/12/03 |        238 | macros/latex-dev/base/ltmarks-doc.tex
-2022/12/03 |        238 | macros/latex-dev/base/lthooks-doc.tex
-2022/12/03 |        238 | macros/latex-dev/base/ltcmdhooks-doc.tex
-2022/12/03 |      23637 | macros/latex-dev/base/ltnews30.tex
-2022/12/03 |      23583 | macros/latex-dev/required/firstaid/latex2e-first-aid-for-external-files.dtx
-2022/12/03 |      23516 | macros/latex-dev/base/fix-cm.dtx
-2022/12/03 |        234 | macros/latex-dev/base/ltpara-doc.tex
-2022/12/03 |     234191 | macros/latex-dev/base/slifonts.pdf
-2022/12/03 |      23386 | macros/latex-dev/base/lppl.tex
-2022/12/03 |     232911 | macros/luatex/generic/pdfextra/pdfextra-doc.pdf
-2022/12/03 |     230028 | macros/latex-dev/base/ltnews19.pdf
-2022/12/03 |      22720 | macros/latex-dev/base/cfgguide.tex
-2022/12/03 |     227059 | macros/latex-dev/base/proc.pdf
-2022/12/03 |      22665 | macros/latex-dev/base/ltxdoc.dtx
-2022/12/03 |     223831 | macros/latex-dev/base/alltt.pdf
-2022/12/03 |     221211 | macros/latex-dev/base/ifthen.pdf
-2022/12/03 |     219349 | macros/latex-dev/base/ltx3info.pdf
-2022/12/03 |       2180 | systems/texlive/tlnet/archive/ffcode.r65170.tar.xz
-2022/12/03 |      21616 | fonts/amiri/Documentation-Arabic.html
-2022/12/03 |     215684 | macros/latex-dev/base/lgc2.pdf
-2022/12/03 |     211770 | macros/latex-dev/base/lthooks.dtx
-2022/12/03 |     211180 | macros/latex-dev/base/nfssfont.pdf
-2022/12/03 |      20652 | macros/latex-dev/base/lgc2.err
-2022/12/03 |     204935 | macros/latex-dev/base/ltnews25.pdf
-2022/12/03 |     204711 | macros/latex-dev/base/exscale.pdf
-2022/12/03 |      20469 | macros/latex-dev/base/ltnews.cls
-2022/12/03 |       2028 | fonts/amiri/README-Arabic.md
-2022/12/03 |     200760 | macros/latex-dev/base/latexsym.pdf
-2022/12/03 |    1986672 | systems/texlive/tlnet/archive/simpleicons.doc.r65167.tar.xz
-2022/12/03 |      19853 | macros/latex-dev/base/ltkeys.dtx
-2022/12/03 |       1937 | macros/latex-dev/base/minimal.cls
-2022/12/03 |       1932 | fonts/amiri/README.md
-2022/12/03 |      19329 | macros/latex-dev/base/ltnews36.tex
-2022/12/03 |      19105 | macros/unicodetex/latex/njuthesis/LICENSE
-2022/12/03 |      19040 | macros/latex-dev/base/lppl.txt
-2022/12/03 |     189819 | macros/latex-dev/base/syntonly.pdf
-2022/12/03 |      18944 | macros/latex-dev/base/ltnews29.tex
-2022/12/03 |      18753 | macros/latex-dev/base/ifthen.dtx
-2022/12/03 |      18711 | macros/latex-dev/base/ltexpl.dtx
-2022/12/03 |      18399 | macros/latex-dev/base/nfssfont.dtx
-2022/12/03 |      18363 | macros/latex-dev/base/ltxref.dtx
-2022/12/03 |     183578 | macros/latex-dev/base/ltcmd.dtx
-2022/12/03 |      18299 | macros/latex-dev/base/ltx3info.tex
-2022/12/03 |     182225 | macros/latex-dev/base/ltnews13.pdf
-2022/12/03 |     182031 | macros/latex/contrib/semantex/semantex.tex
-2022/12/03 |     178723 | macros/latex-dev/base/ltoutput.dtx
-2022/12/03 |      17779 | macros/latex-dev/base/cyrguide.tex
-2022/12/03 |     174494 | macros/latex-dev/base/ltnews05.pdf
-2022/12/03 |      17389 | macros/latex-dev/base/ltbibl.dtx
-2022/12/03 |     172867 | macros/latex-dev/base/tlc2.err
-2022/12/03 |     170878 | macros/latex-dev/base/lamport-manual.pdf
-2022/12/03 |     170595 | macros/latex-dev/base/docstrip.dtx
-2022/12/03 |     170473 | macros/latex-dev/base/ltnews14.pdf
-2022/12/03 |       1694 | macros/latex-dev/base/small2e.tex
-2022/12/03 |     169416 | macros/latex-dev/base/ltnews10.pdf
-2022/12/03 |     166228 | macros/latex-dev/base/ltnews17.pdf
-2022/12/03 |     165821 | macros/latex-dev/base/makeindx.pdf
-2022/12/03 |      16497 | macros/latex-dev/base/modguide.tex
-2022/12/03 |     162772 | macros/latex-dev/base/tulm.pdf
-2022/12/03 |     162180 | fonts/amiri/AmiriQuranColored.ttf
-2022/12/03 |     161713 | macros/latex-dev/base/graphpap.pdf
-2022/12/03 |     161518 | macros/latex-dev/base/ltnews01.pdf
-2022/12/03 |     159792 | macros/latex-dev/base/ltnews02.pdf
-2022/12/03 |     159332 | macros/latex-dev/base/ltnews03.pdf
-2022/12/03 |      15699 | macros/latex-dev/base/slifonts.fdd
-2022/12/03 |     156551 | macros/latex-dev/base/ltnews12.pdf
-2022/12/03 |     156236 | macros/latex-dev/base/classes.dtx
-2022/12/03 |     155053 | macros/latex-dev/base/ltnews08.pdf
-2022/12/03 |      15384 | macros/latex-dev/base/ltvers.dtx
-2022/12/03 |      15306 | macros/latex-dev/base/source2e.tex
-2022/12/03 |     152525 | macros/latex-dev/base/ltnews04.pdf
-2022/12/03 |      15047 | macros/latex-dev/base/ltnews28.tex
-2022/12/03 |     148294 | macros/latex-dev/base/ltoutenc.dtx
-2022/12/03 |     146198 | macros/latex-dev/base/webcomp.pdf
-2022/12/03 |     144369 | macros/latex-dev/base/ltclass.dtx
-2022/12/03 |      14421 | macros/latex-dev/base/lppl-1-2.txt
-2022/12/03 |      14341 | macros/latex-dev/base/lppl-1-1.txt
-2022/12/03 |     142849 | macros/latex-dev/base/ltnews06.pdf
-2022/12/03 |      14091 | macros/latex-dev/base/ltpage.dtx
-2022/12/03 |     140892 | fonts/amiri/AmiriQuran.ttf
-2022/12/03 |     138073 | macros/latex-dev/base/ltnews16.pdf
-2022/12/03 |     137811 | macros/latex-dev/base/ltnews07.pdf
-2022/12/03 |      13759 | macros/latex-dev/base/lamport-manual.err
-2022/12/03 |     136384 | systems/texlive/tlnet/archive/tex4ht.doc.r65171.tar.xz
-2022/12/03 |      13589 | macros/latex-dev/base/proc.dtx
-2022/12/03 |       1341 | macros/latex-dev/base/ltnews18.tex
-2022/12/03 |     132382 | macros/latex-dev/base/lppl.pdf
-2022/12/03 |    1318126 | macros/latex-dev/base/encguide.pdf
-2022/12/03 |     130309 | macros/latex-dev/base/ltnews15.pdf
-2022/12/03 |     129570 | macros/latex-dev/base/ltnews09.pdf
-2022/12/03 |      12932 | systems/texlive/tlnet/archive/csbulletin.r65168.tar.xz
-2022/12/03 |    1285060 | systems/texlive/tlnet/archive/tex4ht.source.r65171.tar.xz
-2022/12/03 |       1279 | macros/latex-dev/base/legal.txt
-2022/12/03 |    1255282 | macros/latex-dev/base/ltnews.pdf
-2022/12/03 |      12520 | macros/latex-dev/base/testpage.tex
-2022/12/03 |    1244739 | macros/unicodetex/latex/njuthesis.zip
-2022/12/03 |      12334 | macros/latex-dev/base/ltnews24.tex
-2022/12/03 |      12242 | macros/latex-dev/base/tulm.fdd
-2022/12/03 |      11852 | macros/latex-dev/base/ltnews37.tex
-2022/12/03 |    1176569 | macros/unicodetex/latex/njuthesis/njuthesis.pdf
-2022/12/03 |     111948 | macros/latex-dev/base/ltnews11.pdf
-2022/12/03 |      11124 | macros/latex-dev/base/manifest.txt
-2022/12/03 |       1101 | macros/luatex/generic/pdfextra/README.md
-2022/12/03 |    1091429 | macros/latex-dev/base/lthooks-code.pdf
-2022/12/03 |     108231 | macros/latex-dev/base/fntguide.tex
-2022/12/03 |      10798 | macros/latex-dev/base/ltnews26.tex
-2022/12/03 |      10792 | macros/latex-dev/base/ltnews22.tex
-2022/12/03 |      10791 | macros/latex-dev/base/ltnews23.tex
-2022/12/03 |       1077 | macros/unicodetex/latex/njuthesis/README.md
-2022/12/03 |    1075110 | macros/latex-dev/base/doc-code.pdf
-2022/12/03 |     106904 | macros/latex-dev/base/inputenc.dtx
-2022/12/03 |      10601 | macros/latex-dev/base/makeindx.dtx
-2022/12/03 |        105 | macros/latex-dev/base/ltfilehook-code.tex
-2022/12/03 |        104 | macros/latex-dev/base/ltshipout-code.tex
-2022/12/03 |        103 | macros/latex-dev/base/ltcmdhooks-code.tex
-2022/12/03 |      10370 | macros/latex-dev/base/ltfsscmp.dtx
-2022/12/03 |        102 | macros/latex-dev/base/ltmarks-code.tex
-2022/12/03 |        102 | macros/latex-dev/base/lthooks-code.tex
-2022/12/03 |      10251 | macros/latex-dev/base/webcomp.err
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index a158eb6516..b2f977711b 100644
--- a/biblio/ctan-bibdata/ctan.bib
+++ b/biblio/ctan-bibdata/ctan.bib
@@ -1,7 +1,7 @@
 %% bib file of all CTAN packages
 %% (C) Herbert Voß
 %% 
-%% created at 10-12-2022, 02:01:10
+%% created at 11-12-2022, 02:01:33
 %% 
 
 %% This file is provided under the terms of the LPPL v1.3 or
@@ -5962,8 +5962,8 @@
   title      = {The \texttt{beamertheme-arguelles} package},
   subtitle   = {Simple, typographic beamer theme},
   author     = {Michele Piazzai},
-  date       = {2022-06-22},
-  version    = {1.2.2},
+  date       = {2022-12-10},
+  version    = {2.0.0},
   license    = {mit},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles},
   url        = {https://ctan.org/pkg/beamertheme-arguelles},
@@ -12449,8 +12449,8 @@
   title      = {The \texttt{CircuiTikZ} package},
   subtitle   = {Draw electrical networks with TikZ},
   author     = {Massimo Redaelli and Stefan Lindner and Stefan Erhardt and Romano Giannetti},
-  date       = {2022-11-12},
-  version    = {1.5.5},
+  date       = {2022-12-10},
+  version    = {1.6.0},
   license    = {lppl,gpl},
   mirror     = {https://mirror.ctan.org/graphics/pgf/contrib/circuitikz},
   url        = {https://ctan.org/pkg/circuitikz},
@@ -44444,7 +44444,7 @@
   title      = {The \texttt{mindflow} package},
   subtitle   = {Write your ideas in a clear way},
   author     = {Jinwen XU},
-  date       = {2022-02-01},
+  date       = {2022-12-10},
   version    = {},
   license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/mindflow},
@@ -47465,9 +47465,9 @@
   title      = {The \texttt{nicefilelist} package},
   subtitle   = {Provide \textbackslash{}listfiles alignment},
   author     = {Uwe Lück},
-  date       = {2017-05-06},
-  version    = {0.7a},
-  license    = {lppl1.3},
+  date       = {2022-12-10},
+  version    = {0.8a},
+  license    = {lppl1.3c},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/nicefilelist},
   url        = {https://ctan.org/pkg/nicefilelist},
 }
@@ -49100,12 +49100,12 @@
   title      = {The \texttt{opencolor} package},
   subtitle   = {Simple use of the Open Color colors},
   author     = {Michele Piazzai},
-  date       = {2022-09-24},
+  date       = {2022-12-10},
   version    = {1.0.0},
   license    = {mit},
   mirror     = {https://mirror.ctan.org/macros/latex/contrib/opencolor},
   url        = {https://ctan.org/pkg/opencolor},
-  annotation = {This package that provides hexadecimal color definitions of the
+  annotation = {This package provides hexadecimal color definitions of the
       130 colors included in the
       
       library.},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index de2a4513d7..888acdcad4 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
index be5dc1e399..a500949b97 100644
--- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex
@@ -5,6 +5,55 @@ full list of changes.
 
 \begin{itemize}
 \item
+  Version 1.6.0 (2022-12-10)
+
+  The big change is the refactoring (and enhancement) of the block's
+  code. In addition, double gate MOSes, several fixes all over the map,
+  and quite a lot of anchors were added into the mix.
+
+  \begin{itemize}
+  \tightlist
+  \item
+    Big change (mostly backward compatible, minus a couple of bug fixes)
+    to the block's code.
+
+    \begin{itemize}
+    \tightlist
+    \item
+      Now \texttt{vco} can be \texttt{box}ed
+    \item
+      enabled more short-name geographical anchors
+    \item
+      generic blocks can be made rectangular
+    \item
+      mid-way lateral anchors for all blocks, as well as up/down
+    \item
+      renamed converters anchors (old ones retained for backward
+      compatibility)
+    \item
+      new ac/ac blocks, both single- and three-phase
+    \end{itemize}
+  \item
+    Added double gate MOS transistors (by Romano Giannetti)
+  \item
+    Fix deformed shape for legacy \texttt{TL} component
+    (\href{https://github.com/circuitikz/circuitikz/issues/664}{issue on
+    GitHub})
+  \item
+    Added several anchors on variable components, suggested by
+    \href{https://github.com/circuitikz/circuitikz/issues/663}{Dr
+    Matthias Jung}
+  \item
+    Added \texttt{genericsplitter} component (by
+    \href{github.com/frankplow}{frankplow})
+  \item
+    Fix - reshape \texttt{splitter} using
+    \texttt{/tripoles/splitter/width} and
+    \texttt{/tripoles/splitter/height} rather than
+    \texttt{/tripoles/wilkinson/width} and
+    \texttt{/tripoles/wilkinson/height}.
+  \end{itemize}
+\item
   Version 1.5.5 (2022-11-12)
 
   New features for optoelectronic devices: a new component, arrow
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
index d8982740f9..173bde4008 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
index 4198c5a2dc..59c070bba4 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
index 9302ccee3b..9a375b69dc 100644
--- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
+++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
@@ -213,6 +213,9 @@ Arrows with \texttt{to[]} components don't work, anyway, so basically avoid this
 \end{circuitikz}
 \end{LTXexample}
 
+Lastly, voltage styles interacts in strange ways with general (such as \texttt{american}, \texttt{european} style), in the sense that sometimes the order in which you enact them is important. That should be arguably fixed, but it will change (read break) a lot of existing code, so it'll stay;  more information and workarounds in section~\ref{sec:mixing-voltage-styles}.
+
+As a final notice, if you want to use the \texttt{externalize} library, do not use the \texttt{circuitikz} environment: use \texttt{tikzpicture} (which is really the same thing, see the FAQ~\ref{faqs:externalize}).
 
 \subsection{Scale factor inaccuracies}\label{sec:usefpu}
 
@@ -246,6 +249,7 @@ The \texttt{use fpu reciprocal} key seems to have no side effects, but given tha
 Here, we will provide a list of incompabilities between different version of \Circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than include a lot of switches and compatibility layers. In general, changes that would invalidate a circuit (changes of polarity of components and so on) are almost always protected by a flag; the same is not true for purely aesthetic changes.
 If unsure, you can check the version in your local installation by using the macro \verb!\pgfcircversion{}!.
 \begin{itemize}
+    \item Version \texttt{1.6.0} has a big rewrite of the block's code. In principle the changes are backward-compatible, but there were several bugs (wrong anchors, errors with rotations, and so on) that have been fixed in the process.
     \item Since \texttt{v1.5.1}\footnote{Do not use \texttt{v1.5.0}, it's buggy.} color management (see section~\ref{sec:colors}) and the details of how the shapes are drawn and protected by the external drawing options has changed. There should be no substantial changes to the circuits, though.
     \item The \TikZ{} fix for \texttt{to[...] +(x,y)} behavior (see~\ref{sec:path-relative-coordinates}) uncovered a bug in the positioning of the labels in \Circuitikz{} that had been present since \texttt{v0.8}. So you \textbf{must} upgrade to \texttt{v1.4.1} or better if you have \TikZ{} newer than \texttt{3.1.8} (and you want/need to use the \texttt{+(x,y)} syntax).
     \item There have been changes in (internal) parameters for capacitors in \texttt{v1.4.1}; now to change them you should use the style interface (see~\ref{sec:capacitors-styling}).
@@ -1705,7 +1709,7 @@ Basically, to write the style \texttt{example}, you edit a file named \texttt{ct
 This kind of style will \emph{add} to the existing style.  If you want to have a style that \emph{substitute} the current style, you should do like this:
 
 \begin{lstlisting}[frame=single, framesep=10pt]
-\ctikzloadstyle{legacy}% start from a know state
+\ctikzloadstyle{legacy}% start from a known state
 \tikzset{romano circuit style/.style={%
     legacy circuit style, % load the legacy style
     \circuitikzbasekey/.cd,%
@@ -2019,9 +2023,9 @@ If \texttt{americanresistors} option is active (or the style \texttt{[american r
 \begin{groupdesc}
     \ctikzset{resistor=american}
     \circuitdescbip[resistor]{R}{Resistor}{american resistor}
-    \circuitdescbip[vresistor]{vR}{Variable resistor}{variable american resistor}
-    \circuitdescbip[potentiometer]{pR}{Potentiometer}{american potentiometer}( wiper/0/0.3 )
-    \circuitdescbip[resistivesens]{sR}{Resistive sensor}{american resistive sensor}( label/0/0.3 )
+    \circuitdescbip[vresistor]{vR}{Variable resistor}{variable american resistor}(wiper/180/0.3, tip/0/0.3)
+    \circuitdescbip[potentiometer]{pR}{Potentiometer}{american potentiometer}(wiper/0/0.3, tip/135/0.2)
+    \circuitdescbip[resistivesens]{sR}{Resistive sensor}{american resistive sensor}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
     \circuitdescbip*[ldresistor]{ldR}{Ligth-Dependent resistor}{american light dependent resistor}(arrows/-45/0.3)
 \end{groupdesc}
 
@@ -2029,9 +2033,9 @@ If  instead \texttt{europeanresistors} option is active (or the style \texttt{[e
 \begin{groupdesc}
     \ctikzset{resistor=european}
     \circuitdescbip*[generic]{R}{Resistor}{european resistor}
-    \circuitdescbip*[tgeneric]{vR}{Variable resistor}{variable european resistor}
-    \circuitdescbip*[genericpotentiometer]{pR}{Potentiometer}{european potentiometer}( wiper/0/0.3 )
-    \circuitdescbip*[thermistor]{sR}{Resistive sensor}{european resistive sensor}( label/0/0.3 )
+    \circuitdescbip*[tgeneric]{vR}{Variable resistor}{variable european resistor}(wiper/180/0.3, tip/0/0.3)
+    \circuitdescbip*[genericpotentiometer]{pR}{Potentiometer}{european potentiometer}(wiper/0/0.3, tip/135/0.2)
+    \circuitdescbip*[thermistor]{sR}{Resistive sensor}{european resistive sensor}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
     \circuitdescbip*[ldgeneric]{ldR}{Ligth-Dependent resistor}{european light dependent resistor}(arrows/-45/0.3)
     \ctikzset{resistor=american} % reset default
 \end{groupdesc}
@@ -2063,6 +2067,23 @@ Since version \texttt{0.9.5}, you can control the position of the wiper in poten
 \end{circuitikz}
 \end{LTXexample}
 
+Since version \texttt{1.6.0}, potentiometers and variable resistors have extra anchors\footnote{Thanks to a suggestion by \href{https://github.com/circuitikz/circuitikz/issues/663}{Dr. Matthias Jung on GitHub}}, to allow this kind of circuits (that seems to be common in some region):
+
+\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
+\begin{circuitikz}[european]
+    \draw (0,0) to[battery2, l=E] ++(0,4.5)
+        -- ++(2,0) coordinate(tmp)
+        to[vR, l2_=$P_1$ and \SI{10}{\kohm}, mirror,
+            invert, name=P]
+        (0,0-|tmp) -- (0,0);
+    \draw (0,0-|tmp) -- ++(1.5,0)
+        to[R=$R_1$, -*] ++(0,2) coordinate(p)
+        |- (P.wiper);
+    \draw (p) to[rmeterwa, t=V] (tmp-|p) -- (tmp);
+\end{circuitikz}
+\end{LTXexample}
+
+
 \subsubsection{Generic sensors anchors}\label{sec:sensors-anchors}
 Generic sensors have an extra anchor named \texttt{label}  to help position the type of dependence, if needed:
 
@@ -2141,8 +2162,8 @@ For the \texttt{photoresistor} and the two ``flavors'' of the light-dependent re
     \circuitdescbip*{capacitor}{Capacitor}{C}
     \circuitdescbip*[ccapacitor]{curved capacitor}{Curved (polarized) capacitor}{cC}
     \circuitdescbip*{ecapacitor}{Electrolytic capacitor}{eC,elko}
-    \circuitdescbip*[vcapacitor]{variable capacitor}{Variable capacitor}{vC}
-    \circuitdescbip*[capacitivesens]{capacitive sensor}{Capacitive sensor}{sC}(label/0/0.3)
+    \circuitdescbip*[vcapacitor]{variable capacitor}{Variable capacitor}{vC}(wiper/180/0.3, tip/0/0.3)
+    \circuitdescbip*[capacitivesens]{capacitive sensor}{Capacitive sensor}{sC}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
     \circuitdescbip*{piezoelectric}{Piezoelectric Element}{PZ}
     \circuitdescbip*{cpe}{Constant Phase Element}{cpe}
     \circuitdescbip*[ferrocap]{feC}{Ferroelectric capacitor\footnotemark}{ferrocap}(kink left/180/0.2, kink right/0/0.2, curve left/160/0.3, curve right/-20/0.2, center/45/0.3)
@@ -2207,24 +2228,24 @@ If the \texttt{cuteinductors} option is active (default behaviour), or the style
 \begin{groupdesc}
     \ctikzset{inductor=cute}
     \circuitdescbip[cuteinductor]{L}{Inductor}{cute inductor}(midtap/90/0.1)
-    \circuitdescbip[vcuteinductor]{vL}{Variable inductor}{variable cute inductor}(core west/135/0.1, core east/45/0.1)
-    \circuitdescbip[scuteinductor]{sL}{Inductive sensor}{cute inductive sensor}(label/0/0.3)
+    \circuitdescbip[vcuteinductor]{vL}{Variable inductor}{variable cute inductor}(wiper/180/0.3, tip/0/0.3)
+    \circuitdescbip[scuteinductor]{sL}{Inductive sensor}{cute inductive sensor}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
 \end{groupdesc}
 
 If the \texttt{americaninductors} option is active (or the style \texttt{[american inductors]} is used), the inductors are displayed as follows:
 \begin{groupdesc}
     \ctikzset{inductor=american}
     \circuitdescbip[americaninductor]{L}{Inductor}{american inductor}(midtap/90/0.3)
-    \circuitdescbip[vamericaninductor]{vL}{Variable inductor}{variable american inductor}(core west/135/0.1, core east/45/0.1)
-    \circuitdescbip[samericaninductor]{sL}{Inductive sensor}{american inductive sensor}( label/0/0.3 )
+    \circuitdescbip[vamericaninductor]{vL}{Variable inductor}{variable american inductor}(core west/135/0.1, core east/45/0.1, wiper/180/0.3, tip/90/0.1)
+    \circuitdescbip[samericaninductor]{sL}{Inductive sensor}{american inductive sensor}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
 \end{groupdesc}
 
 Finally, if the \texttt{europeaninductors} option is active (or the style \texttt{[european inductors]} is used), the inductors are displayed as follows:
 \begin{groupdesc}
     \ctikzset{inductor=european}
     \circuitdescbip[fullgeneric]{L}{Inductor}{european inductor}(midtap/90/0.1)
-    \circuitdescbip[tfullgeneric]{vL}{Variable inductor}{variable european inductor}(core west/135/0.1, core east/45/0.1)
-    \circuitdescbip[sfullgeneric]{sL}{Inductive sensor}{european inductive sensor}( label/0/0.3 )
+    \circuitdescbip[tfullgeneric]{vL}{Variable inductor}{variable european inductor}(wiper/180/0.3, tip/90/0.1,core west/135/0.1, core east/45/0.1)
+    \circuitdescbip[sfullgeneric]{sL}{Inductive sensor}{european inductive sensor}(label/0/0.3, wiper/180/0.3, tip/0/0.3)
     \ctikzset{inductor=cute} % back to default
 \end{groupdesc}
 
@@ -3406,12 +3427,15 @@ You can use the \texttt{plug center} anchor to add the IEC ``multiplier'':
 
 \begin{groupdesc}
     \circuitdesc*{mixer}{mixer}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1, center/-120/0.3, geocenter/-60/.3  )
+    \circuitdesc*{mixer, boxed}{mixer, boxed}{}(right up/30/0.1, right down/-30/0.1, left up/150/0.1, left down/-150/0.1)
     \circuitdesc*{adder}{adder}{}( west/180/0.1,south/-90/0.1,east/0/0.1,north/90/0.1 )
     \circuitdesc*{oscillator}{oscillator}{}( w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1, center/45/0.2, geocenter/-45/.3 )
     \circuitdesc*{circulator}{circulator}{}( left/180/0.1,down/-90/0.1,right/0/0.1, up/90/0.1 )
     \circuitdesc*{wilkinson}{wilkinson divider}{}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
     \circuitdesc*{splitter}{resistive splitter\footnotemark}{}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
     \footnotetext{added by \texttt{matthuszagh}}
+    \circuitdesc*{genericsplitter}{generic splitter\footnotemark}{$\SI{-3}{\deci\bel}$}( in/180/0.1, out2/45/0.1, out1/-45/0.1 )
+    \footnotetext{added by \texttt{frankplow}}
     \circuitdesc*{gridnode}{gridnode\footnotemark}{}(left/135/0.2, right/45/0.2, center/-100/0.4, up/90/0.2, down/-45/.2)
     \footnotetext{added by \texttt{olfline}}
     \circuitdesc*{mzm}{Mach Zehnder Modulator\footnotemark}{}( in/180/0.1, mod/90/0.1, out/0/0.1)
@@ -3419,9 +3443,10 @@ You can use the \texttt{plug center} anchor to add the IEC ``multiplier'':
 \end{groupdesc}
 
 \begin{groupdesc}
-    \circuitdescbip*{twoport}{generic two port (use \texttt{t=\dots} to specify text)}{}
-    \circuitdescbip*{twoportsplit}{generic two port split (use \texttt{t1=\dots} and \texttt{t2=\dots} to specify text)}{}
+    \circuitdescbip*{twoport}{generic two port (use \texttt{t=\dots} to specify text)}{}(w/180/0.1,s/-90/0.1,e/0/0.1,n/90/0.1, center/-120/0.3)
+    \circuitdescbip*{twoportsplit}{generic two port split (use \texttt{t1=\dots} and \texttt{t2=\dots} to specify text)}{}(right up/30/0.1, right down/-30/0.1, left up/150/0.1, left down/-150/0.1)
     \circuitdescbip*{vco}{vco}{}
+    \circuitdescbip*{vco,box}{vco,box}{}(right up/30/0.1, right down/-30/0.1, left up/150/0.1, left down/-150/0.1)
     \circuitdescbip*{bandpass}{bandpass}{}
     \circuitdescbip*{bandstop}{bandstop}{}
     \circuitdescbip*{highpass}{highpass}{}
@@ -3442,12 +3467,14 @@ You can use the \texttt{plug center} anchor to add the IEC ``multiplier'':
     \circuitdescbip*{phaseshifter}{phase shifter}{}
     \circuitdescbip*{vphaseshifter}{var.\ phase shifter}{}
     \circuitdescbip*{detector}{detector}{}
-    \circuitdescbip*{sdcdc}{single wire DC/DC converter\footnotemark}{}
+    \circuitdescbip*{sdcdc}{single wire DC/DC converter\footnotemark}{}(dc up in/135/.3, dc down in/185/.3, dc up out/45/.3, dc down out/-35/.3)
     \footnotetext{the converter blocks added by \texttt{olfline}}
-    \circuitdescbip*{sacdc}{single phase AC/DC converter}{}
-    \circuitdescbip*{sdcac}{single phase DC/AC converter}{}
-    \circuitdescbip*{tacdc}{three phases AC/DC converter}{}
-    \circuitdescbip*{tdcac}{three phases AC/DC converter}{}(left/170/0.5, right/5/0.5, center/-90/0.3, ac1/45/0.1, ac2/-5/.3, ac3/-45/.1, dc1/135/.3, dc2/185/.3)
+    \circuitdescbip*{sacdc}{single phase AC/DC converter}{}(ac up in/135/.3, ac down in/185/.3, dc up out/45/.3, dc down out/-35/.3)
+    \circuitdescbip*{sdcac}{single phase DC/AC converter}{}(dc up in/135/.3, dc down in/185/.3, ac up out/45/.3, ac down out/-35/.3)
+    \circuitdescbip*{sacac}{single phase AC/AC converter}{}(ac up in/135/.3, ac down in/185/.3, ac up out/45/.3, ac down out/-35/.3)
+    \circuitdescbip*{tacdc}{three phases AC/DC converter}{}(ac up in/135/.3, ac mid in/185/.3, ac down in/-135/.3, dc up out/45/.3, dc down out/-35/.3)
+    \circuitdescbip*{tdcac}{three phases AC/DC converter}{}(ac up out/45/0.1, ac mid out/-5/.3, ac down out/-45/.1, dc up in/135/.3, dc down in/185/.3)
+    \circuitdescbip*{tacac}{three phases AC/DC converter}{}(ac up in/135/.3, ac mid in/185/.3, ac down in/-135/.3, ac up out/45/.3, ac mid out/-5/.3, ac down out/-45/.3)
 \end{groupdesc}
 
 \begin{groupdesc}
@@ -3470,6 +3497,39 @@ The ports of the \texttt{mixer}, \texttt{adder}, \texttt{oscillator} and \texttt
 ;\end{circuitikz}
 \end{LTXexample}
 
+In addition, since \texttt{v1.6.0},  most blocks have also the \texttt{left up}, \texttt{left down}, \texttt{right up} and \texttt{right down} anchors:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+    (0,0) to[bandpass, name=bp] ++(2,0)
+    (bp.left up) node[circ, red]{}
+    (bp.left down) node[circ, blue]{}
+    (bp.right up) node[circ, green]{}
+    (bp.right down) node[circ, yellow]{}
+;\end{circuitikz}
+\end{LTXexample}
+
+You can use those anchors to build ``mixed-type'' circuits, positioning the node-shapes:
+\begin{LTXexample}[pos=t, varwidth=true]
+\begin{tikzpicture}[
+    big/.style={circuitikz/blocks/scale=1.5},
+    long/.style={circuitikz/bipoles/twoportsplit/width=1.5}]
+    \path (0,0) node[sacdcshape, big](A){}
+        (5,0) node[twoportsplitshape, big, long, t1=LNA, t2=Digital](B){};
+    \draw (A.right up) -- (B.left up) (A.right down) to[cute choke] (B.left down);
+\end{tikzpicture}
+\end{LTXexample}
+Notice also form the previous example that the generic blocks (\texttt{twoport} and \texttt{twoportsplit}) can be made ``longer'' by setting different \texttt{width} and \texttt{height} (the other blocks are square, and just use the \texttt{width} key for bth dimensions).
+O
+Also, for \texttt{amp} and \texttt{vamp}, the \texttt{up} and \texttt{down} anchors follow the shape when they are not boxed.
+\begin{LTXexample}[varwidth=true]
+\begin{tikzpicture}
+    \draw (0,0) to[vamp, name=a] ++(1.5,0)
+        to [vamp, boxed, name=ab] ++(1.5,0);
+    \path (a.up) node[circ, blue]{} (ab.up) node[circ, blue]{};
+    \path (a.down) node[circ, red]{} (ab.down) node[circ, red]{};
+\end{tikzpicture}
+\end{LTXexample}
+
 The \texttt{oscillator} has a displaced \texttt{center} anchor, to simplify the task of putting it at the left side of a circuit; it also as a special position for the node text. The four round elements (mixer, circulator, adder, and the oscillator) have a \texttt{geocenter} anchor which corresponds always to the center of the circle.
 \begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily]
 \begin{tikzpicture}[>=Stealth]
@@ -3635,14 +3695,21 @@ Several devices have the possibility to add a box around them with the \texttt{b
 
 
 \paragraph{Dash optional parts}
-To show that a device is optional, you can dash it. The inner symbol will be kept with solid lines.
+To show that a device is optional, you can dash it. The inner symbol will be kept with solid lines, unless you set the key \texttt{inner blocks dashed} to true.
+Moreover, the key \texttt{dashed blocks pattern} (default \verb|{{1mm}{1mm}}|), be careful with the number of braces!.
 \begin{LTXexample}[varwidth=true]
 \begin{circuitikz}
-\draw (0,2) to[amp,l=\SI{10}{dB}] ++(2.5,0);
-\draw[dashed] (2.5,2) to[lowpass,l=opt.] ++(2.5,0);
+\draw (0,1.5) to[amp,l=\SI{10}{dB}] ++(2.5,0);
+\draw[dashed] (2.5,1.5) to[lowpass,l=opt.] ++(2.5,0);
 % or just the block
 \draw (0,0) to[amp,l=\SI{10}{dB}] ++(2.5,0)
      to[lowpass,l=opt., dashed] ++(2.5,0);
+% or everything
+\ctikzset{inner blocks dashed,
+    dashed blocks pattern={{1.5pt}{1pt}},
+}
+\draw (0,-1.5) to[amp,l=\SI{10}{dB}] ++(2.5,0)
+     to[lowpass,l=opt., dashed] ++(2.5,0);
 \end{circuitikz}
 \end{LTXexample}
 
@@ -3692,19 +3759,52 @@ Basically they are the same as the normal \texttt{npn} and \texttt{pnp}, and the
 \textsc{nfet}s and \textsc{pfet}s have been incorporated based on code provided by Clemens Helfmeier and Theodor Borsche. Use the package options \texttt{fetsolderdot}/\texttt{nofetsolderdot} to enable/disable solderdot at some fet-transistors. Additionally, the solderdot option can be enabled/disabled for single transistors with the option \texttt{solderdot} and \texttt{nosolderdot}, respectively.
 
 \begin{groupdesc}
-    \circuitdesc{nfet}{nfet}{Q}
-    \circuitdesc{nfetd}{nfet depletion}{Q}
-    \circuitdesc{nigfete}{nigfete}{Q}
+    \circuitdesc{nfet}{nfet}{Q}(G/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{nfetd}{nfet depletion}{Q}(G/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{nigfete}{nigfete}{Q}(G/180/0.1, D/0/0.1, S/0/0.1)
     \circuitdesc{nigfete,solderdot}{nigfete}{}(centergap/0/0.5)
     \circuitdesc{nigfetebulk}{nigfetebulk}{}
     \circuitdesc{nigfetd}{nigfetd}{}(centergap/0/0.5)
-    \circuitdesc{pfet}{pfet}{Q}
-    \circuitdesc{pfetd}{pfet depletion}{Q}
-    \circuitdesc{pigfete}{pigfete}{}(centergap/0/0.5)
+    \circuitdesc{pfet}{pfet}{Q}(G/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{pfetd}{pfet depletion}{Q}(G/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{pigfete}{pigfete}{}(centergap/0/0.5, G/180/0.1, D/0/0.1, S/0/0.1)
     \circuitdesc{pigfetebulk}{pigfetebulk}{}
     \circuitdesc{pigfetd}{pigfetd}{}
 \end{groupdesc}
 
+Since version \texttt{1.6.0}, you can add the \texttt{doublegate} option to the \texttt{*igfet*} family of devices to have a double gate MOS --- the additional gate is called \texttt{G2} or \texttt{gate2} (the plain \texttt{G} is where it will be without the \texttt{doublegate} option).
+
+\begin{groupdesc}
+    \circuitdesc{nigfete, doublegate}{nigfete, doublegate}{Q}(G/180/0.1, G2/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{nigfete,solderdot, doublegate}{nigfete, doublegate}{}(G1/180/0.1, centergap/0/0.5, G2/180/0.1)
+    \circuitdesc{nigfetebulk, doublegate}{nigfetebulk, doublegate}{}(G/180/0.1, G2/180/0.1)
+    \circuitdesc{nigfetd, doublegate}{nigfetd, doublegate}{}(G1/180/0.1, centergap/0/0.5, G2/180/0.1)
+    \circuitdesc{pigfete, doublegate}{pigfete, doublegate}{}(G/180/0.1, centergap/0/0.5, G2/180/0.1, D/0/0.1, S/0/0.1)
+    \circuitdesc{pigfetebulk, doublegate}{pigfetebulk, doublegate}{}(G/180/0.1, G2/180/0.1)
+    \circuitdesc{pigfetd, doublegate}{pigfetd, doublegate}{}(G1/180/0.1, G2/180/0.1)
+\end{groupdesc}
+
+You can use the double-gated transistor for example like this:%
+\footnote{Found at \href{https://www.electronics-notes.com/articles/electronic_components/fet-field-effect-transistor/dual-gate-mosfet.php}{this page on electronics notes}.}
+
+\begin{LTXexample}[varwidth=true, basicstyle=\scriptsize\ttfamily]
+\begin{circuitikz}[european, scale=0.7, transform shape,
+    circuitikz/resistors/scale=0.7]
+    \draw (0,0) to[C, o-*] ++(1,0) coordinate(in)
+    to[R, -*] ++(0,-3) coordinate(GND)
+    ++(1,0) to[C, *-] ++(0,4) -- ++(1,0) coordinate(div)
+    to[R, *-*] ++(0,2) coordinate(vdd)
+    (div) to[R, -*] (div|-GND)
+    (in) -- ++(2.5,0) node[nigfetd, doublegate, anchor=G1](Q){Q}
+    (Q.G2) to[short, -*] (Q.G2-|div)
+    (Q.D) to[R, -*] (Q.D|-vdd)
+    (Q.D) to[C, *-o] ++(2,0) coordinate(out)
+    (Q.S) to[R, *-*] (Q.S|-GND) (Q.S) -- ++(1,0) coordinate(Sd)
+    (Sd) to[C, -*] (Sd |- GND);
+    \draw (0,0|-GND) -- (out|-GND) (0,0|-vdd) -- (out|-vdd);
+\end{circuitikz}
+\end{LTXexample}
+
 \textsc{JFET} are also available\footnote{based on code provided by Danilo Piazzalunga}, both n-type and p-type.
 
 \begin{groupdesc}
@@ -8136,6 +8236,24 @@ This could be especially useful if you define a style, to use like this:
 \end{circuitikz}
 \end{LTXexample}
 
+\subsubsection{Combining different styles}\label{sec:mixing-voltage-styles}
+
+Due to an historical hiccup, you need to be careful if you want to mix styles, like for example having \texttt{american} styled components and straight voltages (which are basically \texttt{european} style, at least in \Circuitikz{}). The problem is that the order of style parameters can change the output\footnote{%
+thanks to Stack Exchange user \href{https://tex.stackexchange.com/q/665466/38080}{Mads P Olesen} for noticing.} as you can see in the following example, where in the red case the voltage generator shape reverted to the \texttt{european} one.
+
+\begin{LTXexample}
+\begin{circuitikz}[straight voltages, american]
+    \draw (0,0) to [V, v=$V_P$] ++(0,3);
+    \draw (1,0) to [R, v=$V_P$] ++(0,3);
+\end{circuitikz}\color{red}%
+\begin{circuitikz}[american, straight voltages]
+    \draw (0,0) to [V, v=$V_P$] ++(0,3);
+    \draw (1,0) to [R, v=$V_P$] ++(0,3);
+\end{circuitikz}
+\end{LTXexample}
+
+This is arguably a bug, but fixing it (separating the voltage generator shapes from the voltage style) would break havoc with older circuits, so this will not be fixed for now.
+
 
 
 \subsection{Changing the style of labels, voltages, and other text ornaments}\label{sec:ornament-style}
@@ -8843,7 +8961,7 @@ To correct the line ending, there are support shapes to fill the missing rectang
 
 \section{Colors}\label{sec:colors}
 
-Color support in \Circuitikz{} has been quite limited up to version 1.5.1; form that one onward there has been an effort to make component's behavior more intuitive.
+Color support in \Circuitikz{} has been quite limited up to version 1.5.1; from that one onward there has been an effort to make component's behavior more intuitive.
 
 Part of the problem is how colors in paths are treated by \TikZ{} itself; you can see part of the discussion \href{https://github.com/circuitikz/circuitikz/issues/605}{this issue} and in \href{https://tex.stackexchange.com/questions/634987/pgf-basic-layer-struggling-again-with-colors}{this question on TeX.SX} --- many thanks to \texttt{@muzimuzhi} for helping there. Basically, nodes are drawn \emph{after} the path is completed, and color is applied to the path at the end. Look at this code (pure \TikZ, no \Circuitikz{} here):
 
@@ -9090,7 +9208,7 @@ Also, since \texttt{v1.2.3}, you can set the key \texttt{open poles fill} (defau
 
 in your preamble.
 
-But really, your circuit definition is buggy, so the best thing to do is fix that; if you want to name a point in you circuit, you should use a \texttt{coordinate}, not a \texttt{node}.\footnote{Yes, I understand from where the confusion arise --- in circuit theory they are called nodes.} Here is a small tutorial on \emph{why} you should change your circuit.
+But really, your circuit definition is buggy, so the best thing to do is fix that; if you want to name a point in your circuit, you should use a \texttt{coordinate}, not a \texttt{node}.\footnote{Yes, I understand from where the confusion arise --- in circuit theory they are called nodes.} Here is a small tutorial on \emph{why} you should change your circuit.
 
 Nodes, in \TikZ, have normally a non-zero size even when they are empty; moreover, connections are supposed to join the border of nodes. Please study the following (pure \TikZ, not \Circuitikz):
 
@@ -9582,7 +9700,7 @@ The best way of contributing is forking the project, adding your component in th
 
 \section{Examples}
 
-Here a series of example, contributed by several people, is shown with their code.
+Here a series of examples, contributed by several people, is shown with their code.
 
 \subsection{A red diode}
 
@@ -9851,20 +9969,23 @@ Here a series of example, contributed by several people, is shown with their cod
 
 \begin{LTXexample}[varwidth=true,pos=t]
 \begin{circuitikz}[smallR/.style={european resistor, resistors/scale=0.5}]
-    \draw (0,0) node[tacdcshape, anchor=ac2](acdc){} to[smallR] ++(-2,0)
+    \draw (0,0) node[tacdcshape, anchor=ac mid in](acdc){} to[smallR] ++(-2,0)
         -- coordinate(point) node[circ](){} ++(-.5,0);
-    \draw (acdc.ac1) to[nos, invert, mirror, name=switch,color=red] ++(-2,0) -- (point);
-    \draw (acdc.ac3) to[smallR] ++(-2,0)
+    \draw (acdc.ac up in)
+        to[nos, invert, mirror, name=switch,color=red] ++(-2,0)
+        -- (point);
+    \draw (acdc.ac down in) to[smallR] ++(-2,0)
         -- (point)
         to[oosourcetrans,prim=wye,sec=delta,l=transformer] ++(-1.5,0)
         to[tmultiwire] ++(-.5,0)
         node[gridnode, anchor=right]{};
     \node[above=.3cm,color=red] at (switch) {fault};
-    \draw (acdc.dc1) to[smallR,l=HVDC line] ++(2,0 )
-        node[tdcacshape, anchor=dc1](dcac){};
-    \draw (acdc.dc2) -- (dcac.dc2);
-    \draw (dcac.right) to[ooosource,prim=delta,sec=delta,tert=wye,invert] ++(1.5,0)
-                        to[tmultiwire] ++(.5,0) node[gridnode,anchor=left]{};
+    \draw (acdc.dc up out) to[smallR,l=HVDC line] ++(2,0 )
+        node[tdcacshape, anchor=dc up in](dcac){};
+    \draw (acdc.dc down out) -- (dcac.dc down in);
+    \draw (dcac.right)
+        to[ooosource,prim=delta,sec=delta,tert=wye,invert] ++(1.5,0)
+        to[tmultiwire] ++(.5,0) node[gridnode,anchor=left]{};
 \end{circuitikz}
 \end{LTXexample}
 
diff --git a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
index 8ed0088ca2..3ab0187228 100644
--- a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
+++ b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
@@ -106,7 +106,7 @@
 }
 %% New circuit description macros
 \newcommand{\twopartbox}[2]{%
-    \leavevmode\null\par\noindent\fbox{\parbox[c]{0.3\linewidth}{#1} \parbox[c]{0.6\linewidth}{\RaggedRight #2}\par\noindent}%
+    \leavevmode\null\par\noindent\fbox{\parbox[c]{0.3\linewidth}{#1} \parbox[c]{0.6\linewidth}{\RaggedRight\hbadness=9500 #2}\par\noindent}%
 }
 % filling color for filled-enabled component
 \colorlet{fillcol}{cyan!30!white}
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index 057df444f3..a245130c4a 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -16,8 +16,8 @@
 \providecommand\DeclareRelease[3]{}
 \providecommand\DeclareCurrentRelease[2]{}
 
-\def\pgfcircversion{1.5.5}
-\def\pgfcircversiondate{2022/11/12}
+\def\pgfcircversion{1.6.0}
+\def\pgfcircversiondate{2022/12/10}
 
 \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
 \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
index 5575b33a96..c80c4ba02e 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
@@ -801,6 +801,8 @@
 %
 % Option "t=*" for nodes
 \pgfkeys{/tikz/t/.add code={}{\ctikzset{text=#1}}}
+\pgfkeys{/tikz/t1/.add code={}{\ctikzset{text in=#1}}}
+\pgfkeys{/tikz/t2/.add code={}{\ctikzset{text out=#1}}}
 %
 \ctikzset{bipole/.is family}
 \ctikzset{bipole/kind/.initial=}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index 7cf950c887..c6677c331f 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -284,7 +284,11 @@
 }
 %% Generic empty tunable
 \pgfcircdeclarebipolescaled{resistors}
-{}
+{
+    \anchor{wiper}{\northeast\pgf@x=-0.5\pgf@x\pgf@y=-\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-0.5\pgf@x\pgf@y=-\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.5\pgf@x}
+}
 {\ctikzvalof{bipoles/tgeneric/height}}
 {tgeneric}
 {\ctikzvalof{bipoles/tgeneric/height}}
@@ -396,6 +400,9 @@
         \pgf@y=1.2\pgf@y
     }%
     \pgfcirc@border@extend@updown{1}{1.2}
+    \anchor{wiper}{\northeast\pgf@x=-\pgf@x\pgf@y=-1.2\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-\pgf@x\pgf@y=-1.2\pgf@y}
+    \anchor{tip}{\northeast}
 }
 {\ctikzvalof{bipoles/thermistor/height}}
 {thermistor}
@@ -510,6 +517,7 @@
         }
     \anchor{wiper}{\wiper}
     \anchor{W}{\wiper}
+    \anchor{tip}{\wiper\pgf@xa=\pgf@x\southwest\pgf@x=\pgf@xa\pgf@y=-\pgf@y}
 }
 {\ctikzvalof{bipoles/generic potentiometer/height 2}}
 {genericpotentiometer}
@@ -632,6 +640,9 @@
 \pgfcircdeclarebipolescaled{resistors}
 {
 \savedmacro{\zigs}{\edef\zigs{\ctikzvalof{resistors/zigs}}}
+\anchor{wiper}{\northeast\pgf@x=-0.4\pgf@x\pgf@y=-\pgf@y}
+\anchor{W}{\northeast\pgf@x=-0.4\pgf@x\pgf@y=-\pgf@y}
+\anchor{tip}{\northeast\pgf@x=0.4\pgf@x}
 }
 {\ctikzvalof{bipoles/vresistor/height}}
 {vresistor}
@@ -647,11 +658,11 @@
         \pgf@circ@set@relative@thickness{modifier thickness}
         \pgfcirc@set@arrows{tunable}{}{latexslim}
         \ifpgf@circ@fixtunable@dir
-            \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
-            \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
+            \pgfpathmoveto{\pgfpoint{-.4\pgf@circ@res@right}{\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
         \else
-            \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
-            \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
+            \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+            \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@right}{\pgf@circ@res@down}}
         \fi
         \pgfusepath{draw}
     \endpgfscope
@@ -670,6 +681,7 @@
     \anchor{wiper}{\wiper}
     \anchor{W}{\wiper}
     \savedmacro{\zigs}{\edef\zigs{\ctikzvalof{resistors/zigs}}}
+    \anchor{tip}{\wiper\pgf@xa=\pgf@x\southwest\pgf@x=\pgf@xa\pgf@y=-\pgf@y}
 }
 {\ctikzvalof{bipoles/potentiometer/height 2}}
 {potentiometer}
@@ -697,6 +709,9 @@
 {% anchor for labelling the type of dependency
     \anchor{label}{\southwest\pgf@x=0.4\pgf@x}%
     \savedmacro{\zigs}{\edef\zigs{\ctikzvalof{resistors/zigs}}}
+    \anchor{wiper}{\northeast\pgf@x=-0.9\pgf@x\pgf@y=-\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-0.9\pgf@x\pgf@y=-\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.4\pgf@x}
 }
 {\ctikzvalof{bipoles/resistivesens/height}}
 {resistivesens}
@@ -710,9 +725,9 @@
 
     \pgfscope
         \pgf@circ@set@relative@thickness{modifier thickness}
-        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@other}{\pgf@circ@res@up}}
-        \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@other}{\pgf@circ@res@down}}
-        \pgfpathlineto{\pgfpoint{-.9\pgf@circ@res@other}{\pgf@circ@res@down}}
+        \pgfpathmoveto{\pgfpoint{.4\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{-.4\pgf@circ@res@right}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{-.9\pgf@circ@res@right}{\pgf@circ@res@down}}
         \pgfusepath{draw}
     \endpgfscope
 }%
@@ -909,6 +924,9 @@
 {
     \anchor{label}{\southwest\pgf@x=2.6\pgf@x\pgf@y=1.2\pgf@y}%
     \pgfcirc@border@extend@full{2.6}{1}{4.4}{1.2}
+    \anchor{wiper}{\northeast\pgf@x=-4.4\pgf@x\pgf@y=-1.2\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-4.4\pgf@x\pgf@y=-1.2\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=2.6\pgf@x}
 }
 {\ctikzvalof{bipoles/capacitor/height}}
 {capacitivesens}
@@ -1037,7 +1055,16 @@
 
 %% Variable Capacitor
 \pgfcircdeclarebipolescaled{capacitors}
-{}
+{
+    \saveddimen{\tunablewidth}{%
+        \pgfmathsetlength{\pgf@x}{\ctikzvalof{bipoles/vcapacitor/tunable width}*
+            \ctikzvalof{bipoles/vcapacitor/width}*0.5*
+            \ctikzvalof{\ctikzclass/scale}*\pgf@circ@Rlen}
+    }
+    \anchor{wiper}{\northeast\pgf@x=-\tunablewidth\pgf@y=-\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-\tunablewidth\pgf@y=-\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=\tunablewidth}
+}
 {\ctikzvalof{bipoles/vcapacitor/height}}
 {vcapacitor}
 {\ctikzvalof{bipoles/vcapacitor/height}}
@@ -1366,6 +1393,9 @@
     \anchor{midtap}{\midtap}
     \pgfcirc@border@extend@full{1}{2}{1.6}{2.6}
     \pgfcir@basic@core@anchors
+    \anchor{wiper}{\southwest\pgf@x=1.6\pgf@x\pgf@y=2.6\pgf@y}
+    \anchor{W}{\southwest\pgf@x=1.6\pgf@x\pgf@y=2.6\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.8\pgf@x\pgf@y=2\pgf@y}
 }
 {\ctikzvalof{bipoles/cuteinductor/lower coil height}}
 {scuteinductor}
@@ -1476,6 +1506,9 @@
     \anchor{core west}{%
         \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
     }
+    \anchor{wiper}{\southwest\pgf@x=0.4\pgf@x\pgf@y=\pgf@y}
+    \anchor{W}{\southwest\pgf@x=0.4\pgf@x\pgf@y=\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.4\pgf@x}
 }
 {\ctikzvalof{bipoles/vcuteinductor/lower coil height}}
 {vcuteinductor}
@@ -1567,6 +1600,9 @@
     \anchor{midtap}{\midtap}
     \pgfcirc@border@extend@full{1}{2}{1.6}{2.6}
     \pgfcir@basic@core@anchors
+    \anchor{wiper}{\southwest\pgf@x=1.6\pgf@x\pgf@y=2.6\pgf@y}
+    \anchor{W}{\southwest\pgf@x=1.6\pgf@x\pgf@y=2.6\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.8\pgf@x\pgf@y=2\pgf@y}
 }
 {\ctikzvalof{bipoles/americaninductor/height 2}}
 {samericaninductor}
@@ -1618,6 +1654,9 @@
     \anchor{core west}{%
         \northeast\pgf@y=0.5\pgf@y\advance\pgf@y by\coredistance\pgf@x=-\pgf@x
     }
+    \anchor{wiper}{\southwest\pgf@x=0.4\pgf@x\pgf@y=\pgf@y}
+    \anchor{W}{\southwest\pgf@x=0.4\pgf@x\pgf@y=\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.4\pgf@x}
 }
 {\ctikzvalof{bipoles/vamericaninductor/height 2}}
 {vamericaninductor}
@@ -1675,6 +1714,9 @@
     \anchor{midtap}{\northeast\pgf@x=0pt\relax}
     \pgfcirc@border@extend@full{1}{2}{1}{2}
     \pgfcir@basic@core@anchors
+    \anchor{wiper}{\northeast\pgf@x=-\pgf@x\pgf@y=-2\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-\pgf@x\pgf@y=-2\pgf@y}
+    \anchor{tip}{\northeast\pgf@y=2\pgf@y}
 }
 {\ctikzvalof{bipoles/fullgeneric/height}}
 {sfullgeneric}
@@ -1706,6 +1748,9 @@
     \anchor{core west}{%
         \northeast\pgf@y=0.4\pgf@y\advance\pgf@y by \coredistance\pgf@x=-\pgf@x
     }
+    \anchor{wiper}{\northeast\pgf@x=-0.5\pgf@x\pgf@y=-\pgf@y}
+    \anchor{W}{\northeast\pgf@x=-0.5\pgf@x\pgf@y=-\pgf@y}
+    \anchor{tip}{\northeast\pgf@x=0.5\pgf@x}
 }
 {\ctikzvalof{bipoles/tfullgeneric/height}}
 {tfullgeneric}
@@ -6509,8 +6554,6 @@
 \ctikzset{bipoles/lamp/width/.initial=.60}
 \ctikzset{bipoles/bulb/height/.initial=.8}
 \ctikzset{bipoles/bulb/width/.initial=.8}
-\ctikzset{bipoles/tline/height/.initial=.3}
-\ctikzset{bipoles/tline/width/.initial=.6}
 \ctikzset{bipoles/squid/height/.initial=.60}
 \ctikzset{bipoles/squid/width/.initial=.60}
 \ctikzset{bipoles/barrier/height/.initial=.60}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
index 4c267929b5..96ecfd5adc 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
@@ -410,6 +410,8 @@
 %>>>
 
 %% Node shapes for RF bipoles%<<<
+\ctikzset{bipoles/tline/height/.initial=.3}
+\ctikzset{bipoles/tline/width/.initial=.6}
 
 \pgfcircdeclarebipolescaled{RF}
 {}
@@ -418,7 +420,7 @@
 {\ctikzvalof{bipoles/tline/height}}
 {\ctikzvalof{bipoles/tline/width}}
 {
-    \pgf@circ@res@step=.2\pgf@circ@res@right % half x axis
+    \pgf@circ@res@step=.4\pgf@circ@res@up % the size of the ellipsis is proportional to the height
     \pgfscope
         \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
         \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right-\pgf@circ@res@step}{\pgf@circ@res@up}}
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
index b34df68a01..568caa1f64 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
@@ -517,6 +517,7 @@
 \ctikzset{bipoles/twoport/height/.initial=.7}
 \ctikzset{bipoles/twoport/text/.initial=}
 \ctikzset{bipoles/twoportsplit/width/.initial=.7}
+\ctikzset{bipoles/twoportsplit/height/.initial=.7}
 \ctikzset{bipoles/twoport/text in/.initial=}
 \ctikzset{bipoles/twoport/text out/.initial=}
 \ctikzset{text/.style={t=#1}}
@@ -563,6 +564,9 @@
 \ctikzset{tripoles/splitter/height/.initial=1.3}
 \ctikzset{tripoles/splitter/width/.initial=1.3}
 
+\ctikzset{tripoles/genericsplitter/height/.initial=1.3}
+\ctikzset{tripoles/genericsplitter/width/.initial=1.3}
+
 \ctikzset{tripoles/mzm/height/.initial=1.3}
 \ctikzset{tripoles/mzm/width/.initial=1.3}
 
@@ -590,7 +594,12 @@
 \newif\ifpgf@circuit@dashed
 \pgfkeys{/tikz/dashed/.add code={}{\pgf@circuit@dashedtrue}}
 \ctikzset{dashed/.add code={}{\pgf@circuit@dashedtrue}}%
-
+% Also draw internal things dashed
+\newif\ifpgf@circuit@full@dashed
+\ctikzset{inner blocks dashed/.is if=pgf@circuit@full@dashed}%
+% Default block dash
+\ctikzset{dashed blocks pattern/.initial={{0.1cm}{0.1cm}}}
+%
 % powerelectronic blocks
 \ctikzset{bipoles/sacdc/width/.initial=.7}
 \ctikzset{bipoles/sdcac/width/.initial=.7}
@@ -621,1231 +630,429 @@
         }%
     \fi
 }
+%%% blocks additional anchors
+\def\pgcirc@twoport@additional@anchors{%
+    \anchor{right down}{\northeast\pgf@y=-0.5\pgf@y}
+    \anchor{left down}{\northeast\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{left up}{\northeast\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{right up}{\northeast\pgf@y=0.5\pgf@y}
+    \anchor{up}{\northeast\pgf@x=0pt\relax}
+    \anchor{down}{\northeast\pgf@y=-\pgf@y\pgf@x=0pt\relax}
+}
+
+%%% definition to help define the blocks. Notice that the height, width, etc are different, so we can't
+%%% simplify more...
+\def\pfgcirc@twoport@get@symbol@rotation{
+    %%% put the needed rotation in \@@rotation
+    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+    \def\@@rotation{0}
+    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
+        \def\@@rotation{270}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225
+        \def\@@rotation{180}
+    \fi\fi
+    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
+        \def\@@rotation{90}
+    \fi\fi
+}
+%
+\def\pfgcirc@twoport@rotate@inner@symbol{%
+    % rotate inner symbol
+    \pfgcirc@twoport@get@symbol@rotation
+    \pgftransformrotate{\@@rotation}
+}
+% enact dashing if needed
+\def\pgfcirc@twoport@maybedash{%
+    \ifpgf@circuit@dashed
+    \edef\@@tmp{\ctikzvalof{dashed blocks pattern}}
+    \expandafter\pgfsetdash\expandafter{\@@tmp}{0cm}
+    \fi
+}
+% debug
+\def\@@printrot{%
+    \pgfsetcolor{red}
+    \pgftext[center,x=0,y=0,]{\tiny\ttfamily\pgf@circ@direction > \@@rotation}
+}
+%
+\def\pgfcirc@twoport@setup#1{%
+    \pgf@circ@res@step = #1\pgf@circ@scaled@Rlen%6 is the real width parameter
+    \divide \pgf@circ@res@step by 2
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-}
+    % let set the dash for the next operations
+    \pgfcirc@twoport@maybedash
+}
+%
+\def\pgfcirc@twoport@draw@sine#1#2{% #1 -> y shift; #2 -> crossed out if != 0
+    % draw inner sine waves; ...res@step must be defined
+    \pgfscope
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgftransformyshift{#1\pgf@circ@res@step}
+        \pgfpathmoveto{\pgfpoint{-.5\pgf@circ@res@step}{0\pgf@circ@res@step}}
+        \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+        \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+        \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
+        \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
+        \ifnum #2=0\else
+            \pgfpathmoveto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
+            \pgfpathlineto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
+        \fi
+        \pgfusepath{draw}
+    \endpgfscope
+}
+%
+\def\pgfcirc@twoport@draw@splitline{%
+    \pgfscope
+        \pgfcirc@twoport@maybedash
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
+        \pgfusepath{draw}
+    \endpgfscope
+}
+%
+\long\def\pgfcirc@define@twoports#1#2#3#4#5#6#7{
+\pgfcircdeclarebipolescaled{#1}
+    {
+        \pgcirc@twoport@additional@anchors
+        #2
+    }
+    {#3}
+    {#4}
+    {#5}
+    {#6}
+    {
+        \pgfcirc@twoport@setup{#6}
+        % draw outer box
+        \pgf@circ@twoportbox
+        % draw solid line for inner symbol if no box is drawn and not fully dashed
+        \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
+        \pgf@circ@inputarrow
+        \pfgcirc@twoport@rotate@inner@symbol
+        #7
+    }
+}
+%
+\long\def\pgfcirc@define@twoports@norotate#1#2#3#4#5#6#7{
+\pgfcircdeclarebipolescaled{#1}
+    {
+        \pgcirc@twoport@additional@anchors
+        #2
+    }
+    {#3}
+    {#4}
+    {#5}
+    {#6}
+    {
+        \pgfcirc@twoport@setup{#6}
+        % draw outer box
+        \pgf@circ@twoportbox
+        % draw solid line for inner symbol if no box is drawn and not fully dashed
+        \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
+        \pgf@circ@inputarrow
+        #7
+    }
+}
 %% Generic two port box
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/twoport/height}}
 {twoport}
 {\ctikzvalof{bipoles/twoport/height}}
 {\ctikzvalof{bipoles/twoport/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/twoport/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % draw inner symbol
     \pgf@circ@text@strokecolor
     \pgftext[center,x=0,y=0]{\ctikzvalof{bipoles/twoport/text}}
 
 }
-
 %% twoport split
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
-{\ctikzvalof{bipoles/twoportsplit/width}}
+{\ctikzvalof{bipoles/twoportsplit/height}}
 {twoportsplit}
-{\ctikzvalof{bipoles/twoportsplit/width}}
+{\ctikzvalof{bipoles/twoportsplit/height}}
 {\ctikzvalof{bipoles/twoportsplit/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/twoportsplit/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
     %get texts
     \def\pgfcirc@tin{\ctikzvalof{bipoles/twoport/text in}}
     \def\pgfcirc@tout{\ctikzvalof{bipoles/twoport/text out}}
-
-    % rotate inner symbol
-    \def\texti{\pgfcirc@tin}
-    \def\textii{\pgfcirc@tout}
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \def\texti{\pgfcirc@tout}
-        \def\textii{\pgfcirc@tin}
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \def\texti{\pgfcirc@tout}
-        \def\textii{\pgfcirc@tin}
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-        \def\texti{\pgfcirc@tin}
-        \def\textii{\pgfcirc@tout}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
+    % shuffle text depending on rotation
+    \pgfcirc@twoport@draw@splitline
+    %
     \pgf@circ@text@strokecolor
-    \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\texti}
-    \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textii}
-}
-
-%% voltage controled oscillator
-\pgfcircdeclarebipolescaled{blocks}
-{}
-{\ctikzvalof{bipoles/vco/width}}
-{vco}
-{\ctikzvalof{bipoles/twoport/width}}
-{\ctikzvalof{bipoles/vco/width}}
-{
-    \pgf@circ@res@step = \ctikzvalof{bipoles/vco/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-    % draw circle
-    \pgfscope
-        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-        \pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@step}
-        \pgf@circ@draworfill
-    \endpgfscope
-    \ifpgf@circuit@inputarrow
-        {
-            \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
-            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-        }
+    \ifnum\@@rotation<145
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\pgfcirc@tin}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\pgfcirc@tout}
+    \else
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\pgfcirc@tout}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\pgfcirc@tin}
     \fi
-
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner sine waves
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-.5\pgf@circ@res@step}{0\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
 }
-
 %% bandpass filter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/bandpass/width}}
 {bandpass}
 {\ctikzvalof{bipoles/bandpass/width}}
 {\ctikzvalof{bipoles/bandpass/width}}
 {
-
-    \pgf@circ@res@step = \ctikzvalof{bipoles/bandpass/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.5}{1}
+    \pgfcirc@twoport@draw@sine{0.0}{0}
+    \pgfcirc@twoport@draw@sine{-0.5}{1}
 }
-
 %% bandstop filter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/bandstop/width}}
 {bandstop}
 {\ctikzvalof{bipoles/bandstop/width}}
 {\ctikzvalof{bipoles/bandstop/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/bandstop/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225% 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}% always draw solid line for inner symbol
-    \pgfsetarrows{-}%never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.5}{0}
+    \pgfcirc@twoport@draw@sine{0.0}{1}
+    \pgfcirc@twoport@draw@sine{-0.5}{0}
 }
-
 %% highpass filter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/highpass/width}}
 {highpass}
 {\ctikzvalof{bipoles/highpass/width}}
 {\ctikzvalof{bipoles/highpass/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/highpass/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.65\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{-0.35\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.5}{0}
+    \pgfcirc@twoport@draw@sine{0.0}{1}
+    \pgfcirc@twoport@draw@sine{-0.5}{1}
 }
-
 %% highpass2 filter ---simplyfied with just two waves
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/highpass2/width}}
 {highpass2}
 {\ctikzvalof{bipoles/highpass2/width}}
 {\ctikzvalof{bipoles/highpass2/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/highpass2/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.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}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.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}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@step}{-0.1\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.25}{0}
+    \pgfcirc@twoport@draw@sine{-0.25}{1}
 }
-
 %% lowpass filter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/lowpass/width}}
 {lowpass}
 {\ctikzvalof{bipoles/lowpass/width}}
 {\ctikzvalof{bipoles/lowpass/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/lowpass/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{0.35\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.65\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.15\pgf@circ@res@step}{-0.15\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.15\pgf@circ@res@step}{0.15\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.5}{1}
+    \pgfcirc@twoport@draw@sine{0.0}{1}
+    \pgfcirc@twoport@draw@sine{-0.5}{0}
 }
-
 %% lowpass2 filter: simplyfied with just two waves
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/lowpass2/width}}
 {lowpass2}
 {\ctikzvalof{bipoles/lowpass2/width}}
 {\ctikzvalof{bipoles/lowpass2/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/lowpass2/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.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}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{0.1\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.3\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.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}}
-    \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}
+    \pgfcirc@twoport@draw@sine{0.25}{1}
+    \pgfcirc@twoport@draw@sine{-0.25}{0}
 }
-
 %% allpass filter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/allpass/width}}
 {allpass}
 {\ctikzvalof{bipoles/allpass/width}}
 {\ctikzvalof{bipoles/allpass/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/allpass/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.25\pgf@circ@res@step}{-.25\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.25\pgf@circ@res@step}{.25\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@sine{0.5}{0}
+    \pgfcirc@twoport@draw@sine{0.0}{0}
+    \pgfcirc@twoport@draw@sine{-0.5}{0}
 }
-
 %% ADC
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/adc/width}}
 {adc}
 {\ctikzvalof{bipoles/adc/width}}
 {\ctikzvalof{bipoles/adc/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/adc/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\texti{A}
-    \def\textii{D}
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \def\texti{D}
-        \def\textii{A}
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \def\texti{D}
-        \def\textii{A}
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-        \def\texti{A}
-        \def\textii{D}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
+    \pgfcirc@twoport@draw@splitline
+    %
     \pgf@circ@text@strokecolor
-    \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
-    \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
+    \ifnum\@@rotation<145
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{A}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{D}
+    \else
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{D}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{A}
+    \fi
 }
 
 %% DAC
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/dac/width}}
 {dac}
 {\ctikzvalof{bipoles/dac/width}}
 {\ctikzvalof{bipoles/dac/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/dac/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\texti{D}
-    \def\textii{A}
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \def\texti{A}
-        \def\textii{D}
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \def\texti{A}
-        \def\textii{D}
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-        \def\texti{D}
-        \def\textii{A}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
+    \pgfcirc@twoport@draw@splitline
+    %
     \pgf@circ@text@strokecolor
-    \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{\textsf{\texti}}
-    \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{\textsf{\textii}}
+    \ifnum\@@rotation<145
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{D}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{A}
+    \else
+        \pgftext[center,x=0.45\pgf@circ@res@left,y=0.45\pgf@circ@res@up]{A}
+        \pgftext[center,x=0.45\pgf@circ@res@right,y=0.45\pgf@circ@res@down]{D}
+    \fi
 }
 
 %% DSP
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/dsp/width}}
 {dsp}
 {\ctikzvalof{bipoles/dsp/width}}
 {\ctikzvalof{bipoles/dsp/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/dsp/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
     \pgf@circ@text@strokecolor
     \pgftext[center,x=0,y=0]{\textsf{DSP}}
 }
-
 %% FFT
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/fft/width}}
 {fft}
 {\ctikzvalof{bipoles/fft/width}}
 {\ctikzvalof{bipoles/fft/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/fft/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
     \pgf@circ@text@strokecolor
     \pgftext[center,x=0,y=0]{\textsf{FFT}}
 }
-
-%% Amplifier
-\pgfcircdeclarebipolescaled{blocks}
-{}
-{
-    \ifpgf@circuit@boxed
-        \ctikzvalof{bipoles/twoport/width}
-    \else
-        \ctikzvalof{bipoles/amp/width}
-    \fi
-}
-{amp}
-{
-    \ifpgf@circuit@boxed
-        \ctikzvalof{bipoles/twoport/width}
-    \else
-        \ctikzvalof{bipoles/amp/width}
-    \fi
-}
-{
-    \ifpgf@circuit@boxed
-        \ctikzvalof{bipoles/twoport/width}
-    \else
-        \ctikzvalof{bipoles/amp/width}
-    \fi
-}
-{
-    \pgf@circ@res@step = \ctikzvalof{bipoles/amp/width}\pgf@circ@scaled@Rlen
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \ifpgf@circuit@boxed
-        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-        \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
-        \pgf@circ@draworfill
-    \fi
-
-    % draw input arrow
-    \ifpgf@circuit@inputarrow
-        {
-            \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
-            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-        }
-    \fi
-
-    \ifpgf@circuit@boxed
-        \pgfsetlinewidth{\pgfstartlinewidth}
-        \pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
-        \pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
-    \else
-        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-    \fi
-
-    \pgfsetarrows{-} %never draw arrows
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
-    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
-
-    \pgfpathclose
-    \pgf@circ@draworfill
-
-    % draw inner text
-    \pgf@circ@text@strokecolor
-    \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
-}
-
-
-%% variable amplifier
-\pgfcircdeclarebipolescaled{blocks}
-{}
-{
-    \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@scaled@Rlen
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \ifpgf@circuit@boxed
-        \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
-    \fi
-
-    % draw input arrow
-    \ifpgf@circuit@inputarrow
-        {
-            \advance \pgf@circ@res@left by -.5\ctikzvalof{bipoles/thickness}\pgfstartlinewidth
-            \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}}
-            \pgfnode{inputarrow}{tip}{}{pgf@inputarrow}{\pgfusepath{fill}}
-        }
-    \fi
-
-    \ifpgf@circuit@boxed
-        \pgfsetlinewidth{\pgfstartlinewidth}
-        \pgfsetdash{}{0pt}	% draw solid line for inner symbol if no box is drawn
-        \pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
-    \else
-        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
-    \fi
-
-
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-
-    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
-    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
-
-    \pgfpathclose
-    \pgf@circ@draworfill
-
-
-    % draw arrow
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfsetarrowsend{latex}
-    \pgfpathmoveto{\pgfpoint{-0.8\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@step}{0.6\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    % draw inner text
-    \pgf@circ@text@strokecolor
-    \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
-}
-
 %% pi attenuator
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/piattenuator/width}}
 {piattenuator}
 {\ctikzvalof{bipoles/piattenuator/width}}
 {\ctikzvalof{bipoles/piattenuator/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/piattenuator/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
     \pgfsetlinewidth{\pgfstartlinewidth}
     \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
     \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
     \pgfusepath{draw}
 }
-
 %% variable pi attenuator
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/vpiattenuator/width}}
 {vpiattenuator}
 {\ctikzvalof{bipoles/vpiattenuator/width}}
 {\ctikzvalof{bipoles/vpiattenuator/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/vpiattenuator/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
     \pgfsetlinewidth{\pgfstartlinewidth}
     \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.4\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
     \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
     \pgfusepath{draw}
-
-    \pgfsetarrowsend{latex}
+    \pgfcirc@set@arrows{tunable}{}{latex}
     \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
     \pgfusepath{draw}
 }
-
 %% T attenuator
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/tattenuator/width}}
 {tattenuator}
 {\ctikzvalof{bipoles/tattenuator/width}}
 {\ctikzvalof{bipoles/tattenuator/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/tattenuator/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
     \pgfsetlinewidth{\pgfstartlinewidth}
     \pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
     \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
     \pgfusepath{draw}
 }
-
 %% variable T attenuator
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/vtattenuator/width}}
 {vtattenuator}
 {\ctikzvalof{bipoles/vtattenuator/width}}
 {\ctikzvalof{bipoles/vtattenuator/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/vtattenuator/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
     \pgfsetlinewidth{\pgfstartlinewidth}
     \pgfpathmoveto{\pgfpoint{0pt}{0.4\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0pt}{0.4\pgf@circ@res@up}}
-    \pgfusepath{draw}
     \pgfpathmoveto{\pgfpoint{0.6\pgf@circ@res@left}{0.4\pgf@circ@res@up}}
     \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@right}{0.4\pgf@circ@res@up}}
     \pgfusepath{draw}
-
-    \pgfsetarrowsend{latex}
+    \pgfcirc@set@arrows{tunable}{}{latex}
     \pgfpathmoveto{\pgfpoint{0.7\pgf@circ@res@left}{0.5\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.8\pgf@circ@res@up}}
     \pgfusepath{draw}
 }
-
 %% phase shifter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/phaseshifter/width}}
 {phaseshifter}
 {\ctikzvalof{bipoles/phaseshifter/width}}
 {\ctikzvalof{bipoles/phaseshifter/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/phaseshifter/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
     % inner symbol
     \pgf@circ@text@strokecolor
     \pgftext[center,x=0,y=0]{\Large$\varphi$}
 }
-
 %% variable phase shifter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {}
 {\ctikzvalof{bipoles/phaseshifter/width}}
 {vphaseshifter}
 {\ctikzvalof{bipoles/vphaseshifter/width}}
 {\ctikzvalof{bipoles/vphaseshifter/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/vphaseshifter/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 135 \ifnum \pgfcircmathresult < 225
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
     \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfsetarrowsend{latex}
+    \pgfcirc@set@arrows{tunable}{}{latex}
     \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0.65\pgf@circ@res@down}}
     \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@right}{0.65\pgf@circ@res@up}}
     \pgfusepath{draw}
     % inner symbol
     \pgf@circ@text@strokecolor
     \pgftext[center,x=0,y=0]{\Large$\varphi$}
-
 }
 
 %% detector
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports@norotate{blocks}
 {}
 {\ctikzvalof{bipoles/detector/width}}
 {detector}
 {\ctikzvalof{bipoles/detector/width}}
 {\ctikzvalof{bipoles/detector/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/detector/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
     % draw inner stuff
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
     \pgfsetlinewidth{0.8\pgfstartlinewidth}
     \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{0}}
     \pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@right}{0}}
     \pgfusepath{draw}
-
     \ifpgf@circuit@fulldiode
         \pgfmathparse{2\pgf@circ@res@up / \pgf@circ@scaled@Rlen / \ctikzvalof{bipoles/generic/width}}
         \pgftransformscale{\pgfmathresult}
@@ -1855,414 +1062,360 @@
         \pgftransformscale{\pgfmathresult}
         \pgfnode{emptydiodeshape}{center}{}{pgf@emptydiode}{\pgfusepath{fill}}
     \fi
-
 }
 
+%% converters help function
+\def\pgf@circ@twoport@converter@dc#1#2{%
+    \pgfscope
+    \pgftransformshift{\pgfpoint{#1\pgf@circ@res@step}{#2\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-0.25\pgf@circ@res@step}{0.125\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.25\pgf@circ@res@step}{0.125\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \pgfpathmoveto{\pgfpoint{-0.25\pgf@circ@res@step}{-0.125\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.25\pgf@circ@res@step}{-0.125\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \endpgfscope
+}
+\def\pgf@circ@twoport@converter@dc@up{%
+    \pgf@circ@twoport@converter@dc{-0.5}{0.5}
+}
+\def\pgf@circ@twoport@converter@dc@down{%
+    \pgf@circ@twoport@converter@dc{0.5}{-0.5}
+}
+\def\pgf@circ@twoport@converter@ac#1#2{%
+    \pgfscope
+    \pgftransformshift{\pgfpoint{#1\pgf@circ@res@step}{#2\pgf@circ@res@step}}
+    \pgfpathmoveto{\pgfpoint{-.31\pgf@circ@res@step}{0\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
+    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
+    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
+    \pgfusepath{draw}
+    \endpgfscope
+}
+\def\pgf@circ@twoport@converter@ac@up{%
+    \pgf@circ@twoport@converter@ac{-0.45}{0.5}
+    }
+\def\pgf@circ@twoport@converter@ac@down{%
+    \pgf@circ@twoport@converter@ac{0.45}{-0.5}
+}
+\def\pgf@circ@twoport@converter@tac@up{%
+    \pgf@circ@twoport@converter@ac{-0.45}{0.65}
+    \pgf@circ@twoport@converter@ac{-0.45}{0.5}
+    \pgf@circ@twoport@converter@ac{-0.45}{0.35}
+}
+\def\pgf@circ@twoport@converter@tac@down{%
+    \pgf@circ@twoport@converter@ac{0.45}{-0.65}
+    \pgf@circ@twoport@converter@ac{0.45}{-0.5}
+    \pgf@circ@twoport@converter@ac{0.45}{-0.35}
+}
 %% single phase ac/dc converter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {
-    \anchor{dc1}{
-        \northeast
-        \pgf@y=.4\pgf@y
-    }
-    \anchor{dc2}{
-        \northeast
-        \pgf@y=-.4\pgf@y
-    }
+    % these two are left for backward compatibiliyt
+    \anchor{dc1}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{dc2}{\northeast\pgf@y=-.4\pgf@y}
+    % better
+    \anchor{ac up in}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac down in}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc up out}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{dc down out}{\northeast\pgf@y=-.4\pgf@y}
 }
 {\ctikzvalof{bipoles/sacdc/width}}
 {sacdc}
 {\ctikzvalof{bipoles/sacdc/width}}
 {\ctikzvalof{bipoles/sacdc/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/sacdc/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \pgfcirc@twoport@draw@splitline
+    \ifnum\@@rotation<145 % swap dc/ac for "backward" and "up" symbol
+        \pgf@circ@twoport@converter@ac@up
+        \pgf@circ@twoport@converter@dc@down
+    \else
+        \pgf@circ@twoport@converter@dc@up
+        \pgf@circ@twoport@converter@ac@down
     \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
-    % draw sin wave
-    \pgfpathmoveto{\pgfpoint{-.76\pgf@circ@res@step}{.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.625\pgf@circ@res@step}}
-    \pgfusepath{draw}
 }
-
-
 %% dc/dc converter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {
-    \anchor{dc1}{
-        \northeast
-        \pgf@y=.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{dc2}{
-        \northeast
-        \pgf@y=-.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
+    % these two are left for backward compatibiliyt
+    \anchor{dc1}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc2}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    % better
+    \anchor{dc up in}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc down in}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc up out}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{dc down out}{\northeast\pgf@y=-.4\pgf@y}
 }
 {\ctikzvalof{bipoles/sdcdc/width}}
 {sdcdc}
 {\ctikzvalof{bipoles/sdcdc/width}}
 {\ctikzvalof{bipoles/sdcdc/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/sdcdc/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-    \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.625\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.625\pgf@circ@res@step}}
-    \pgfusepath{draw}
+    \pgfcirc@twoport@draw@splitline
+    % No need to switch here
+    \pgf@circ@twoport@converter@dc@up
+    \pgf@circ@twoport@converter@dc@down
 }
-
-
 %% single phase dc/ac converter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {
-    \anchor{dc1}{
-        \northeast
-        \pgf@y=.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{dc2}{
-        \northeast
-        \pgf@y=-.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
+    % these two are left for backward compatibiliyt
+    \anchor{dc1}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc2}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    % better
+    \anchor{dc up in}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc down in}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac up out}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{ac down out}{\northeast\pgf@y=-.4\pgf@y}
 }
 {\ctikzvalof{bipoles/sdcac/width}}
 {sdcac}
 {\ctikzvalof{bipoles/sdcac/width}}
 {\ctikzvalof{bipoles/sdcac/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/sdcac/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \pgfcirc@twoport@draw@splitline
+    \ifnum\@@rotation<145 % swap dc/ac for "backward" and "up" symbol
+        \pgf@circ@twoport@converter@dc@up
+        \pgf@circ@twoport@converter@ac@down
+    \else
+        \pgf@circ@twoport@converter@ac@up
+        \pgf@circ@twoport@converter@dc@down
     \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
-    % draw sin wave
-    \pgfpathmoveto{\pgfpoint{.14\pgf@circ@res@step}{-.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.625\pgf@circ@res@step}}
-    \pgfusepath{draw}
 }
-
-
+%% single phase ac/ac converter
+\pgfcirc@define@twoports{blocks}
+{
+    \anchor{ac up in}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac down in}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac up out}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{ac down out}{\northeast\pgf@y=-.4\pgf@y}
+}
+{\ctikzvalof{bipoles/sdcac/width}}
+{sacac}
+{\ctikzvalof{bipoles/sdcac/width}}
+{\ctikzvalof{bipoles/sdcac/width}}
+{
+    \pgfcirc@twoport@draw@splitline
+    \pgf@circ@twoport@converter@ac@up
+    \pgf@circ@twoport@converter@ac@down
+}
 %% threephase ac/dc converter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {
-    \anchor{dc1}{
-        \northeast
-        \pgf@y=.4\pgf@y
-    }
-    \anchor{dc2}{
-        \northeast
-        \pgf@y=-.4\pgf@y
-    }
-    \anchor{ac1}{
-        \northeast
-        \pgf@y=.6\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{ac2}{
-        \northeast
-        \pgf@y=0\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{ac3}{
-        \northeast
-        \pgf@y=-.6\pgf@y
-        \pgf@x=-\pgf@x
-    }
+    % legacy, let for compatibility
+    \anchor{dc1}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{dc2}{\northeast\pgf@y=-.4\pgf@y}
+    \anchor{ac1}{\northeast\pgf@y=.6\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac2}{\northeast\pgf@y=0\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac3}{\northeast\pgf@y=-.6\pgf@y\pgf@x=-\pgf@x}
+    %better
+    \anchor{dc up out}{\northeast\pgf@y=.4\pgf@y}
+    \anchor{dc down out}{\northeast\pgf@y=-.4\pgf@y}
+    \anchor{ac up in}{\northeast\pgf@y=.6\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac mid in}{\northeast\pgf@y=0\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac down in}{\northeast\pgf@y=-.6\pgf@y\pgf@x=-\pgf@x}
 }
 {\ctikzvalof{bipoles/tacdc/width}}
 {tacdc}
 {\ctikzvalof{bipoles/tacdc/width}}
 {\ctikzvalof{bipoles/tacdc/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/tacdc/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \pgfcirc@twoport@draw@splitline
+    \ifnum\@@rotation<145 % swap dc/ac for "backward" and "up" symbol
+        \pgf@circ@twoport@converter@tac@up
+        \pgf@circ@twoport@converter@dc@down
+    \else
+        \pgf@circ@twoport@converter@dc@up
+        \pgf@circ@twoport@converter@tac@down
     \fi
-
-    % draw outer box
-    \pgf@circ@twoportbox
-    \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
-    \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
-    % draw sin waves
-    \pgfpathmoveto{\pgfpoint{-.76\pgf@circ@res@step}{.65\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-.76\pgf@circ@res@step}{.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-.76\pgf@circ@res@step}{.35\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-
-
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{.2\pgf@circ@res@step}{-.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@step}{-0.625\pgf@circ@res@step}}
-    \pgfusepath{draw}
 }
-
-
 %% threephase dc/ac converter
-\pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports{blocks}
 {
-    \anchor{dc1}{
-        \northeast
-        \pgf@y=.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{dc2}{
-        \northeast
-        \pgf@y=-.4\pgf@y
-        \pgf@x=-\pgf@x
-    }
-    \anchor{ac1}{
-        \northeast
-        \pgf@y=.6\pgf@y
-    }
-    \anchor{ac2}{
-        \northeast
-        \pgf@y=0\pgf@y
-    }
-    \anchor{ac3}{
-        \northeast
-        \pgf@y=-.6\pgf@y
-    }
+    % legacy, let for compatibility
+    \anchor{dc1}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc2}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac1}{\northeast\pgf@y=.6\pgf@y}
+    \anchor{ac2}{\northeast\pgf@y=0\pgf@y}
+    \anchor{ac3}{\northeast\pgf@y=-.6\pgf@y}
+    %better
+    \anchor{dc up in}{\northeast\pgf@y=.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{dc down in}{\northeast\pgf@y=-.4\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac up out}{\northeast\pgf@y=.6\pgf@y}
+    \anchor{ac mid out}{\northeast\pgf@y=0\pgf@y}
+    \anchor{ac down out}{\northeast\pgf@y=-.6\pgf@y}
 }
 {\ctikzvalof{bipoles/tdcac/width}}
 {tdcac}
 {\ctikzvalof{bipoles/tdcac/width}}
 {\ctikzvalof{bipoles/tdcac/width}}
 {
-    \pgf@circ@res@step = \ctikzvalof{bipoles/tdcac/width}\pgf@circ@scaled@Rlen
-    \divide \pgf@circ@res@step by 2
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-    \pgf@circ@res@other = \pgf@circ@res@left
-    \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-    \ifpgf@circuit@dashed
-        \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
+    \pgfcirc@twoport@draw@splitline
+    \ifnum\@@rotation<145 % swap dc/ac for "backward" and "up" symbol
+        \pgf@circ@twoport@converter@dc@up
+        \pgf@circ@twoport@converter@tac@down
+    \else
+        \pgf@circ@twoport@converter@tac@up
+        \pgf@circ@twoport@converter@dc@down
     \fi
-
+}
+%% threephase ac/ac converter
+\pgfcirc@define@twoports{blocks}
+{
+    \anchor{ac up in}{\northeast\pgf@y=.6\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac mid in}{\northeast\pgf@y=0\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac down in}{\northeast\pgf@y=-.6\pgf@y\pgf@x=-\pgf@x}
+    \anchor{ac up out}{\northeast\pgf@y=.6\pgf@y}
+    \anchor{ac mid out}{\northeast\pgf@y=0\pgf@y}
+    \anchor{ac down out}{\northeast\pgf@y=-.6\pgf@y}
+}
+{\ctikzvalof{bipoles/tdcac/width}}
+{tacac}
+{\ctikzvalof{bipoles/tdcac/width}}
+{\ctikzvalof{bipoles/tdcac/width}}
+{
+    \pgfcirc@twoport@draw@splitline
+    \pgf@circ@twoport@converter@tac@down
+    \pgf@circ@twoport@converter@tac@up
+}
+%%%% Non-square blocks. We do not use the standard macros
+%%%% this one is adapted to do the boxed thing
+%
+\long\def\pgfcirc@define@twoports@boxed#1#2#3#4#5#6#7{
+\pgfcircdeclarebipolescaled{#1}
+    {
+        \savedmacro{\componentisboxed}{\edef\componentisboxed{\ifpgf@circuit@boxed 1\else 0\fi}}
+        \pgcirc@twoport@additional@anchors
+        #2
+    }
+    {#3}
+    {#4}
+    {#5}
+    {#6}
+    {
+    \pgf@circ@res@step=#6\pgf@circ@scaled@Rlen %6 is the real width parameter
+    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+    \pgfsetarrows{-}
+    \pgfcirc@twoport@maybedash
     % draw outer box
-    \pgf@circ@twoportbox
+    \ifpgf@circuit@boxed
+        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+        \pgfnode{blockbox}{center}{}{pgf@box}{\pgfusepath{draw}}
+        \pgf@circ@draworfill
+    \fi
     \pgf@circ@inputarrow
-    % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
+    \ifpgf@circuit@boxed
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        % draw solid line for inner symbol if no box is drawn and not fully dashed
+        \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
+        \pgf@circ@res@step=.7\pgf@circ@res@step % scale amp symbol when inside a box
+    \else
+        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+    \fi
+    #7
+    }
+}
+%% voltage controled oscillator
+\pgfcirc@define@twoports@boxed{blocks}
+{}
+{\ctikzvalof{bipoles/vco/width}}
+{vco}
+{\ctikzvalof{bipoles/twoport/width}}
+{\ctikzvalof{bipoles/vco/width}}
+{
+    % ok, this is a bit of incoherence
+    \divide \pgf@circ@res@step by 2
+    % draw circle
+    \pgfscope
+        \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
+        \pgfpathcircle{\pgfpoint{0}{0}} {\pgf@circ@res@step}
+        \pgf@circ@draworfill
+    \endpgfscope
+    \pfgcirc@twoport@rotate@inner@symbol
+    \pgfcirc@twoport@draw@sine{0}{0}
+}
+%% amplifier and vamplifier
+%% Amplifier %% Beware, not using the generic twoport(s) macros.
+\pgfcirc@define@twoports@boxed{blocks}
+{
+    \anchor{up}{%
+        \northeast\pgf@x=0pt\relax
+        \ifnum\componentisboxed=0
+            \pgf@y=0.55\pgf@y
+        \fi
+    }
+    \anchor{down}{%
+        \northeast\pgf@x=0pt\pgf@y=-\pgf@y\relax
+        \ifnum\componentisboxed=0
+            \pgf@y=0.55\pgf@y
+        \fi
+    }
+}
+{\ifpgf@circuit@boxed\ctikzvalof{bipoles/twoport/width}\else\ctikzvalof{bipoles/amp/width}\fi}
+{amp}
+{\ifpgf@circuit@boxed\ctikzvalof{bipoles/twoport/width}\else\ctikzvalof{bipoles/amp/width}\fi}
+{\ifpgf@circuit@boxed\ctikzvalof{bipoles/twoport/width}\else\ctikzvalof{bipoles/amp/width}\fi}
+{
+    % draw triangle
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
+    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
+    \pgfpathclose
+    \pgf@circ@draworfill
+    \pfgcirc@twoport@get@symbol@rotation
+    % draw inner text
+    \pgf@circ@text@strokecolor
+    \ifnum\@@rotation=180
         \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 225 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-    \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-    \pgfsetarrows{-} %never draw arrows
+        \pgftext[center,x=0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+    \else
+        \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+    \fi
+}
+%% variable amplifier %% Beware, not using the generic twoport(s) macros.
+% \pgfcircdeclarebipolescaled{blocks}
+\pgfcirc@define@twoports@boxed{blocks}
+{
+    \anchor{up}{%
+        \northeast\pgf@x=0pt\relax
+        \ifnum\componentisboxed=0
+            \pgf@y=0.55\pgf@y
+        \fi
+    }
+    \anchor{down}{%
+        \northeast\pgf@x=0pt\pgf@y=-\pgf@y\relax
+        \ifnum\componentisboxed=0
+            \pgf@y=0.55\pgf@y
+        \fi
+    }
+}
+{\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}
+{
+    % draw triangle
+    \pgfpathmoveto{\pgfpoint{-0.5\pgf@circ@res@step}{0.55\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@step}{0}}
+    \pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@step}{-0.55\pgf@circ@res@step}}
+    \pgfpathclose
+    \pgf@circ@draworfill
+    \pfgcirc@twoport@get@symbol@rotation
+    % draw arrow
     \pgfsetlinewidth{\pgfstartlinewidth}
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@down}}
-    \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up}}
-    \pgfusepath{draw}
-
-    % draw sin waves
-    \pgfpathmoveto{\pgfpoint{.14\pgf@circ@res@step}{-.65\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{.14\pgf@circ@res@step}{-.5\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{.14\pgf@circ@res@step}{-.35\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathsine{\pgfpoint{.17\pgf@circ@res@step}{-.17\pgf@circ@res@step}}
-    \pgfpathcosine{\pgfpoint{.17\pgf@circ@res@step}{.17\pgf@circ@res@step}}
-    \pgfusepath{draw}
-
-
-
-
-    % draw equal sign
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.375\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.375\pgf@circ@res@step}}
-    \pgfusepath{draw}
-    \pgfpathmoveto{\pgfpoint{-.2\pgf@circ@res@step}{.625\pgf@circ@res@step}}
-    \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@step}{0.625\pgf@circ@res@step}}
+    \pgfcirc@set@arrows{tunable}{}{latex}
+    \pgfpathmoveto{\pgfpoint{-0.8\pgf@circ@res@step}{-0.5\pgf@circ@res@step}}
+    \pgfpathlineto{\pgfpoint{0.6\pgf@circ@res@step}{0.6\pgf@circ@res@step}}
     \pgfusepath{draw}
+    % draw inner text
+    \pgf@circ@text@strokecolor
+    \ifnum\@@rotation=180
+        \pgftransformrotate{180}
+        \pgftext[center,x=0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+    \else
+        \pgftext[center,x=-0.12\pgf@circ@res@step,y=0]{\ctikzvalof{bipoles/twoport/text}}
+    \fi
 }
 % %>>>
 
@@ -2294,8 +1447,10 @@
 \pgfcirc@activate@bipole@simple{l}{sacdc}
 \pgfcirc@activate@bipole@simple{l}{sdcac}
 \pgfcirc@activate@bipole@simple{l}{sdcdc}
+\pgfcirc@activate@bipole@simple{l}{sacac}
 \pgfcirc@activate@bipole@simple{l}{tacdc}
 \pgfcirc@activate@bipole@simple{l}{tdcac}
+\pgfcirc@activate@bipole@simple{l}{tacac}
 % %>>>
 
 %% Node shapes for  Block elements %<<<
@@ -2344,6 +1499,13 @@
     \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{left down}{\northwest\pgf@y=-0.5\pgf@y}
+    \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
+    \anchor{text}{\northwest
+        \advance\pgf@y\dimexpr-.5\dp\pgfnodeparttextbox+.5\ht\pgfnodeparttextbox\relax
+        \pgf@x=-.5\wd\pgfnodeparttextbox\relax}
 }
 % draw the body rectangle and circle if and when needed
 \def\pgf@circ@circular@rf@box@circle{%
@@ -2355,7 +1517,8 @@
     % draw outer circle
     \ifpgf@circuit@boxed
         \pgf@circ@res@step=.7\pgf@circ@res@step
-        \pgfsetdash{}{0pt}	% draw solid circle if boxed
+        % draw solid line for inner symbol if no box is drawn and not fully dashed
+        \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
     \else
         \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
     \fi
@@ -2380,7 +1543,8 @@
         \pgfscope
             \pgf@circ@circular@rf@box@circle
             % draw inner stuff
-            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            % draw solid line for inner symbol if no box is drawn and not fully dashed
+            \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
             \pgfsetlinewidth{\pgfstartlinewidth}
             \pgfpathmoveto{\pgfpointorigin}
             \pgfpathmoveto{\pgfpointpolar{135}{0.5\pgf@circ@res@step}}
@@ -2408,7 +1572,8 @@
         \pgfscope
             \pgf@circ@circular@rf@box@circle
             % draw inner stuff
-            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            % draw solid line for inner symbol if no box is drawn and not fully dashed
+            \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
             \pgfsetlinewidth{\pgfstartlinewidth}
             \pgfpathmoveto{\pgfpointorigin}
             \pgfpathmoveto{\pgfpointpolar{0}{0.3\pgf@circ@res@step}}
@@ -2443,7 +1608,8 @@
         \pgfscope
             \pgf@circ@circular@rf@box@circle
             % draw inner sine waves
-            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            % draw solid line for inner symbol if no box is drawn and not fully dashed
+            \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
             \pgfsetlinewidth{\pgfstartlinewidth}
             \pgfsetcornersarced{\pgfpointorigin}% do not use rounded corners!
             \pgfpathmoveto{\pgfpoint{-0.3\pgf@circ@res@step}{0\pgf@circ@res@step}}
@@ -2471,7 +1637,8 @@
         \pgfscope
             \pgf@circ@circular@rf@box@circle
             % inner arrow
-            \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+            % draw solid line for inner symbol if no box is drawn and not fully dashed
+            \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
             \pgfsetlinewidth{\pgfstartlinewidth}
             \pgfsetarrowsend{latex}
             \pgfpathmoveto{\pgfpoint{-0.25\pgf@circ@res@step}{0}}
@@ -2494,63 +1661,16 @@
             \pgf@x=-\ctikzvalof{quadpoles/gridnode/width}\pgf@circ@scaled@Rlen
             \pgf@x=.5\pgf@x
     }
-    \anchor{center}{
-        \pgfpointorigin
-    }
-
-    \anchor{north}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{up}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{south}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=-\pgf@y
-    }
-    \anchor{down}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=-\pgf@y
-    }
-    \anchor{east}{
-        \northwest
-        \pgf@y=0pt
-        \pgf@x=-\pgf@x
-    }
-    \anchor{right}{
-        \northwest
-        \pgf@y=0pt
-        \pgf@x=-\pgf@x
-    }
-    \anchor{west}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{left}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{south west}{
-        \northwest
-        \pgf@y=-\pgf@y
-    }
-    \anchor{north east}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \relax
-    }
-    \anchor{north west}{
-        \northwest
-    }
-    \anchor{south east}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-\pgf@y
-    }
+    \pgfcirc@northwest@symmetric@geoanchors
+    \anchor{center}{\pgfpointorigin}
+    \anchor{up}{\northwest\pgf@x=0pt}
+    \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{left}{\northwest\pgf@y=0pt}
+    \anchor{left down}{\northwest\pgf@y=-0.5\pgf@y}
+    \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
     \anchor{text}{
         \pgf@x=-2\pgf@x
         \advance \pgf@x by -.5\wd\pgfnodeparttextbox
@@ -2559,50 +1679,39 @@
     \pgf@circ@draw@component{
         \pgf@circ@setcolor
         \pgf@circ@scaled@Rlen=\scaledRlen
-
         \pgf@circ@res@step=\ctikzvalof{quadpoles/gridnode/width}\pgf@circ@scaled@Rlen
-
         \northwest
         \pgf@circ@res@up = \pgf@y
         \pgf@circ@res@down = -\pgf@y
         \pgf@circ@res@right = -\pgf@x
         \pgf@circ@res@left = \pgf@x
-
         \pgf@circ@res@step = \ctikzvalof{quadpoles/gridnode/width}\pgf@circ@scaled@Rlen
         \divide \pgf@circ@res@step by 2
-
         \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
         \pgf@circ@res@other = \pgf@circ@res@left
         \advance\pgf@circ@res@other by \pgf@circ@res@step
-
-        \ifpgf@circuit@dashed
-            \pgfsetdash{{0.1cm}{0.1cm}}{0cm}
-        \fi
-
+        \pgfcirc@twoport@maybedash
         % draw outer box
         \pgf@circ@twoportbox
         \pgf@circ@inputarrow
-
         \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
         \pgfsetarrows{-} %never draw arrows
         \pgfsetlinewidth{0.05mm}
-
         % draw grid
         \foreach \line in {-1,-.5,...,1}
         {
             \pgfpathmoveto{\pgfpoint{\line\pgf@circ@res@right}{\pgf@circ@res@up}}
             \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\line\pgf@circ@res@up}}
-
+            %
             \pgfpathmoveto{\pgfpoint{\line\pgf@circ@res@right}{\pgf@circ@res@up}}
             \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\line\pgf@circ@res@down}}
         }
-
         %prevent from draw the inner cross twice
         \foreach \line in {-.5,0,...,.5}
         {
             \pgfpathmoveto{\pgfpoint{\line\pgf@circ@res@right}{\pgf@circ@res@down}}
             \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\line\pgf@circ@res@up}}
-
+            %
             \pgfpathmoveto{\pgfpoint{\line\pgf@circ@res@right}{\pgf@circ@res@down}}
             \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\line\pgf@circ@res@down}}
         }
@@ -2623,59 +1732,19 @@
         \pgf@x=.5\pgf@x
         \pgf@x=-\ctikzvalof{tripoles/wilkinson/width}\pgf@x
     }
-    \anchor{center}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=0pt
-    }
-    \anchor{north}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{south}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=-\pgf@y
-    }
-    \anchor{west}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{east}{
-        \northwest
-        \pgf@y=0pt
-        \pgf@x=-\pgf@x
-    }
-    \anchor{south west}{
-        \northwest
-        \pgf@y=-\pgf@y
-    }
-    \anchor{north east}{
-        \northwest
-        \pgf@x=-\pgf@x
-    }
-    \anchor{north west}{
-        \northwest
-    }
-    \anchor{south east}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-\pgf@y
-    }
-    \anchor{in}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{out1}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-0.5\pgf@y
-    }
-    \anchor{out2}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=0.5\pgf@y
-    }
+    \pgfcirc@northwest@symmetric@geoanchors
+    \anchor{up}{\northwest\pgf@x=0pt}
+    \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{left}{\northwest\pgf@y=0pt}
+    \anchor{center}{\pgfpointorigin}
+    \anchor{in}{\northwest\pgf@y=0pt}
+    \anchor{out1}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{out2}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left down}{\northwest\pgf@y=-0.5\pgf@y}
+    \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
     \anchor{text}{
         \northwest
         \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
@@ -2684,20 +1753,17 @@
     \pgf@circ@draw@component{
         \pgf@circ@setcolor
         \pgf@circ@scaled@Rlen=\scaledRlen
-
+        %
         \northwest
         \pgf@circ@res@up = \pgf@y
         \pgf@circ@res@down = -\pgf@y
         \pgf@circ@res@right = -\pgf@x
         \pgf@circ@res@left = \pgf@x
-
+        %
         \pgfstartlinewidth=\pgflinewidth
-
         % draw outer box
         \pgf@circ@twoportbox
         \pgf@circ@inputarrow
-
-
         % draw inner stuff
         \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
         \pgfsetarrows{-} %never draw arrows
@@ -2709,15 +1775,12 @@
         \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
         \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
         \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-
         \pgfusepath{draw}
-
         \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
         % draw inner resisitor - european or american style is recognised
         {
             \pgftransformshift{\pgfpoint{0.5\pgf@circ@res@right}{0pt}}
             \pgftransformrotate{90}
-
             % calculate size of resistor
             \ifpgf@circuit@europeanresistor
                 \pgfmathparse{\pgf@circ@res@up / \pgf@circ@scaled@Rlen / \ctikzvalof{bipoles/generic/width} / 2}
@@ -2729,14 +1792,11 @@
                 \pgfnode{resistorshape}{center}{}{wilk@int@R}{\pgfusepath{fill}}
             \fi
         }
-
         \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
         \pgfpathlineto{\pgfpointanchor{wilk@int@R}{right}}
-
         \pgfpathmoveto{\pgfpointanchor{wilk@int@R}{left}}
         \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
         \pgfusepath{draw}
-
     }
 }
 
@@ -2746,65 +1806,25 @@
     \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
     \savedanchor\northwest{%
         \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
-        \pgf@y=\ctikzvalof{tripoles/wilkinson/height}\pgf@circ@scaled@Rlen
+        \pgf@y=\ctikzvalof{tripoles/splitter/height}\pgf@circ@scaled@Rlen
         \pgf@y=.5\pgf@y
         \pgf@x= \pgf@circ@scaled@Rlen
         \pgf@x=.5\pgf@x
-        \pgf@x=-\ctikzvalof{tripoles/wilkinson/width}\pgf@x
-    }
-    \anchor{center}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=0pt
-    }
-    \anchor{north}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{south}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=-\pgf@y
-    }
-    \anchor{west}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{east}{
-        \northwest
-        \pgf@y=0pt
-        \pgf@x=-\pgf@x
-    }
-    \anchor{south west}{
-        \northwest
-        \pgf@y=-\pgf@y
-    }
-    \anchor{north east}{
-        \northwest
-        \pgf@x=-\pgf@x
-    }
-    \anchor{north west}{
-        \northwest
-    }
-    \anchor{south east}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-\pgf@y
-    }
-    \anchor{in}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{out1}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-0.5\pgf@y
-    }
-    \anchor{out2}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=0.5\pgf@y
+        \pgf@x=-\ctikzvalof{tripoles/splitter/width}\pgf@x
     }
+    \pgfcirc@northwest@symmetric@geoanchors
+    \anchor{center}{\pgfpointorigin}
+    \anchor{up}{\northwest\pgf@x=0pt}
+    \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{left}{\northwest\pgf@y=0pt}
+    \anchor{in}{\northwest\pgf@y=0pt}
+    \anchor{out1}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{out2}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left down}{\northwest\pgf@y=-0.5\pgf@y}
+    \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
     \anchor{text}{
         \northwest
         \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
@@ -2813,15 +1833,14 @@
     \pgf@circ@draw@component{
         \pgf@circ@setcolor
         \pgf@circ@scaled@Rlen=\scaledRlen
-
+        %
         \northwest
         \pgf@circ@res@up = \pgf@y
         \pgf@circ@res@down = -\pgf@y
         \pgf@circ@res@right = -\pgf@x
         \pgf@circ@res@left = \pgf@x
-
+        %
         \pgfstartlinewidth=\pgflinewidth
-
         % draw outer box
         \pgf@circ@twoportbox
         \pgf@circ@inputarrow
@@ -2836,9 +1855,8 @@
         \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
         \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
         \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
-
         \pgfusepath{draw}
-
+        %
         \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
         % draw inner resisitors - european or american style is recognised
         \foreach \respt/\resang/\linepta/\lineptb in %
@@ -2852,7 +1870,6 @@
             {
                 \pgftransformshift{\respt}
                 \pgftransformrotate{\resang}
-
                 % calculate size of resistor
                 \ifpgf@circuit@europeanresistor
                     \pgfmathparse{\pgf@circ@res@up / \pgf@circ@scaled@Rlen / \ctikzvalof{bipoles/generic/width} / 2}
@@ -2864,10 +1881,8 @@
                     \pgfnode{resistorshape}{center}{}{wilk@int@R}{\pgfusepath{fill}}
                 \fi
             }
-
             \pgfpathmoveto{\linepta}
             \pgfpathlineto{\pgfpointanchor{wilk@int@R}{right}}
-
             \pgfpathmoveto{\pgfpointanchor{wilk@int@R}{left}}
             \pgfpathlineto{\lineptb}
             \pgfusepath{draw}
@@ -2875,17 +1890,81 @@
     }
 }
 
+%% generic splitter
+\pgfdeclareshape{genericsplitter}{
+    \savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
+    \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
+    \savedanchor\northwest{%
+        \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
+        \pgf@y=\ctikzvalof{tripoles/genericsplitter/height}\pgf@circ@scaled@Rlen
+        \pgf@y=.5\pgf@y
+        \pgf@x= \pgf@circ@scaled@Rlen
+        \pgf@x=.5\pgf@x
+        \pgf@x=-\ctikzvalof{tripoles/genericsplitter/width}\pgf@x
+    }
+    \pgfcirc@northwest@symmetric@geoanchors
+    \anchor{center}{\pgfpointorigin}
+    \anchor{up}{\northwest\pgf@x=0pt}
+    \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+    \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+    \anchor{left}{\northwest\pgf@y=0pt}
+    \anchor{in}{\northwest\pgf@y=0pt}
+    \anchor{out1}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{out2}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left down}{\northwest\pgf@y=-0.5\pgf@y}
+    \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+    \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+    \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
+    \anchor{text}{
+        \northwest
+        \pgf@y=-.5\ht\pgfnodeparttextbox
+        \pgf@x=-.2\wd\pgfnodeparttextbox
+    }
+    \pgf@circ@draw@component{
+        \pgf@circ@setcolor
+        \pgf@circ@scaled@Rlen=\scaledRlen
+        %
+        \northwest
+        \pgf@circ@res@up = \pgf@y
+        \pgf@circ@res@down = -\pgf@y
+        \pgf@circ@res@right = -\pgf@x
+        \pgf@circ@res@left = \pgf@x
+        %
+        \pgfstartlinewidth=\pgflinewidth
+        % draw outer box
+        \pgf@circ@twoportbox
+        \pgf@circ@inputarrow
+        % draw inner stuff
+        \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+        \pgfsetarrows{-} %never draw arrows
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}}
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@left}{0pt}}
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0.5\pgf@circ@res@down}}
+        \pgfusepath{draw}
+        %
+        \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
+        % draw inner resisitors - european or american style is recognised
+        \foreach \linepta/\lineptb in %
+        { \pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@up}/\pgfpoint{0.5\pgf@circ@res@left}{0},%
+          \pgfpoint{0.5\pgf@circ@res@right}{0.5\pgf@circ@res@down}/\pgfpoint{0.5\pgf@circ@res@left}{0}}
+        {
+            \pgfpathmoveto{\linepta}
+            \pgfpathlineto{\lineptb}
+            \pgfusepath{draw}
+        }
+    }
+}
+
 %% couplers generics
 \long\def\pgfcircdeclarefourport#1#2{
-
     \pgfdeclareshape{#1}{
         \savedmacro{\ctikzclass}{\edef\ctikzclass{blocks}}
         \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}}
-        \anchor{center}{
-            \northwest
-            \pgf@x=0pt
-            \pgf@y=0pt
-        }
         \savedanchor\northwest{%
             \pgfmathsetlength{\pgf@circ@scaled@Rlen}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}
             \pgf@y=\ctikzvalof{quadpoles/#1/height}\pgf@circ@scaled@Rlen
@@ -2893,95 +1972,25 @@
             \pgf@x=.5\pgf@circ@scaled@Rlen
             \pgf@x=-\ctikzvalof{quadpoles/#1/width}\pgf@x
         }
-        \anchor{north}{
-            \northwest
-            \pgf@x=0pt
-        }
-        \anchor{south}{
-            \northwest
-            \pgf@x=0pt
-            \pgf@y=-\pgf@y
-        }
-        \anchor{west}{
-            \northwest
-            \pgf@y=0pt
-        }
-        \anchor{east}{
-            \northwest
-            \pgf@y=0pt
-            \pgf@x=-\pgf@x
-        }
-        \anchor{south west}{
-            \northwest
-            \pgf@y=-\pgf@y
-        }
-        \anchor{north east}{
-            \northwest
-            \pgf@x=-\pgf@x
-        }
-        \anchor{north west}{
-            \northwest
-        }
-        \anchor{south east}{
-            \northwest
-            \pgf@x=-\pgf@x
-            \pgf@y=-\pgf@y
-        }
-        \anchor{port1}{
-            \northwest
-            \pgf@y=-0.5\pgf@y
-        }
-        \anchor{port2}{
-            \northwest
-            \pgf@x=-\pgf@x
-            \pgf@y=-0.5\pgf@y
-        }
-        \anchor{port3}{
-            \northwest
-            \pgf@x=-\pgf@x
-            \pgf@y=0.5\pgf@y
-        }
-        \anchor{port4}{
-            \northwest
-            \pgf@y=0.5\pgf@y
-        }
-        \anchor{left down}{
-            \northwest
-            \pgf@y=-0.5\pgf@y
-        }
-        \anchor{right down}{
-            \northwest
-            \pgf@x=-\pgf@x
-            \pgf@y=-0.5\pgf@y
-        }
-        \anchor{right up}{
-            \northwest
-            \pgf@x=-\pgf@x
-            \pgf@y=0.5\pgf@y
-        }
-        \anchor{left up}{
-            \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
-        }
-
+        \pgfcirc@northwest@symmetric@geoanchors
+        \anchor{center}{\pgfpointorigin}
+        \anchor{up}{\northwest\pgf@x=0pt}
+        \anchor{down}{\northwest\pgf@x=0pt\pgf@y=-\pgf@y}
+        \anchor{right}{\northwest\pgf@y=0pt\pgf@x=-\pgf@x}
+        \anchor{left}{\northwest\pgf@y=0pt}
+        \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{left down}{\northwest\pgf@y=-0.5\pgf@y}
+        \anchor{right down}{\northwest\pgf@x=-\pgf@x\pgf@y=-0.5\pgf@y}
+        \anchor{right up}{\northwest\pgf@x=-\pgf@x\pgf@y=0.5\pgf@y}
+        \anchor{left up}{\northwest\pgf@y=0.5\pgf@y}
+        %1,2,3,4 are deprecated
+        \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
@@ -2989,16 +1998,14 @@
         }
         \pgf@circ@draw@component{
             \pgf@circ@setcolor
-
             \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@scaled@Rlen=\scaledRlen
-
+            %
             \pgfstartlinewidth=\pgflinewidth
-
             % draw outer box
             \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth}
             \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
@@ -3081,58 +2088,11 @@
         \pgf@x=.5\pgf@x
         \pgf@x=-\ctikzvalof{tripoles/mzm/width}\pgf@x
     }
-    \anchor{center}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=0pt
-    }
-    \anchor{north}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{south}{
-        \northwest
-        \pgf@x=0pt
-        \pgf@y=-\pgf@y
-    }
-    \anchor{west}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{east}{
-        \northwest
-        \pgf@y=0pt
-        \pgf@x=-\pgf@x
-    }
-    \anchor{south west}{
-        \northwest
-        \pgf@y=-\pgf@y
-    }
-    \anchor{north east}{
-        \northwest
-        \pgf@x=-\pgf@x
-    }
-    \anchor{north west}{
-        \northwest
-    }
-    \anchor{south east}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=-\pgf@y
-    }
-    \anchor{in}{
-        \northwest
-        \pgf@y=0pt
-    }
-    \anchor{mod}{
-        \northwest
-        \pgf@x=0pt
-    }
-    \anchor{out}{
-        \northwest
-        \pgf@x=-\pgf@x
-        \pgf@y=0pt
-    }
+    \pgfcirc@northwest@symmetric@geoanchors
+    \anchor{center}{\pgfpointorigin}
+    \anchor{in}{ \northwest \pgf@y=0pt }
+    \anchor{mod}{ \northwest \pgf@x=0pt }
+    \anchor{out}{ \northwest \pgf@x=-\pgf@x \pgf@y=0pt }
     \anchor{text}{
         \northwest
         \advance \pgf@y by 0.5\ht\pgfnodeparttextbox
@@ -3141,74 +2101,50 @@
     \pgf@circ@draw@component{
         \pgf@circ@setcolor
         \pgf@circ@scaled@Rlen=\scaledRlen
-
         \northwest
         \pgf@circ@res@up = \pgf@y
         \pgf@circ@res@down = -\pgf@y
         \pgf@circ@res@right = -\pgf@x
         \pgf@circ@res@left = \pgf@x
-
         \pgfstartlinewidth=\pgflinewidth
-
         % draw outer box
         \pgf@circ@twoportbox
         \pgf@circ@inputarrow
-
         % draw inner stuff
-          % rotate inner symbol
-    \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
-    \ifnum \pgfcircmathresult > 45 \ifnum \pgfcircmathresult < 135
-        \pgftransformrotate{270}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 134 \ifnum \pgfcircmathresult < 225  % 134 degree, because >= 135 is not possible
-        \pgftransformrotate{180}
-    \fi\fi
-    \ifnum \pgfcircmathresult > 224 \ifnum \pgfcircmathresult < 315
-        \pgftransformrotate{90}
-    \fi\fi
-
-    % draw inner symbol
-     \pgfsetdash{}{0pt}	% always draw solid line for inner symbol
-     \pgfsetarrows{-} %never draw arrows
-     \pgfsetlinewidth{\pgfstartlinewidth}
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
-     \pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@up}}
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
-     \pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@up}}
-	\pgfusepath{draw}
-
-	\pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
-	\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
-	\pgfusepath{draw}
-
-    \pgfpathmoveto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{0.35\pgf@circ@res@up}}
-	\pgfpathlineto{\pgfpoint{0.25\pgf@circ@res@right}{0.1\pgf@circ@res@up}}
-	\pgfusepath{draw}
-
-    }
+        \pfgcirc@twoport@rotate@inner@symbol
+        % draw inner symbol
+        \ifpgf@circuit@full@dashed\else\pgfsetdash{}{0pt}\fi
+        \pgfsetarrows{-} %never draw arrows
+        \pgfsetlinewidth{\pgfstartlinewidth}
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@up}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@left}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
+        %
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.75\pgf@circ@res@right}{\pgf@circ@res@zero}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@up}}
+        %
+        \pgfpathmoveto{\pgfpoint{0.5\pgf@circ@res@right}{0.25\pgf@circ@res@down}}
+        \pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@left}{0.25\pgf@circ@res@down}}
+        %
+        \pgfpathmoveto{\pgfpoint{\pgf@circ@res@zero}{\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{\pgf@circ@res@zero}{0.35\pgf@circ@res@up}}
+        \pgfpathlineto{\pgfpoint{0.25\pgf@circ@res@right}{0.1\pgf@circ@res@up}}
+        \pgfusepath{draw}
+        }
 }
 % %>>>
 
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
index 7b03c9b267..35f147bf49 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
@@ -2859,6 +2859,13 @@
 \pgfkeys{/tikz/nosolderdot/.add code={}{\pgf@circuit@fet@solderdotfalse}}
 \ctikzset{nosolderdot/.add code={}{\pgf@circuit@fet@solderdotfalse}}
 
+%%%% activate doublegate
+\newif\ifpgf@circuit@fet@doublegate
+\pgfkeys{/tikz/doublegate/.add code={}{\pgf@circuit@fet@doublegatetrue}}
+\ctikzset{doublegate/.add code={}{\pgf@circuit@fet@doublegatetrue}}
+\pgfkeys{/tikz/nodoublegate/.add code={}{\pgf@circuit@fet@doublegatefalse}}
+\ctikzset{nodoublegate/.add code={}{\pgf@circuit@fet@doublegatefalse}}
+
 % Option bodydiode for fet
 \newif\ifpgf@circuit@fet@bodydiode
 \pgfkeys{/tikz/bodydiode/.add code={}{\pgf@circuit@fet@bodydiodetrue}}
@@ -3787,12 +3794,38 @@
             \left
             \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
         }
+        \anchor{G1}{
+            \northeast
+            \pgf@circ@res@step=\ctikzvalof{tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{G2}{
+            \northeast
+            \pgf@circ@res@step=\ctikzvalof{tripoles/#1/conn height}\pgf@y
+            \pgf@circ@res@step=-0.3333333\pgf@circ@res@step
+            \left
+            \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
+        }
         \anchor{gate}{
             \northeast
             \pgf@circ@res@step=\ctikzvalof{tripoles/#1/conn height}\pgf@y
             \left
             \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
         }
+        \anchor{gate1}{
+            \northeast
+            \pgf@circ@res@step=\ctikzvalof{tripoles/#1/conn height}\pgf@y
+            \left
+            \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
+        }
+        \anchor{gate2}{
+            \northeast
+            \pgf@circ@res@step=\ctikzvalof{tripoles/#1/conn height}\pgf@y
+            \pgf@circ@res@step=-0.3333333\pgf@circ@res@step
+            \left
+            \pgf@y=-\ctikzvalof{tripoles/#1/curr direction}\pgf@circ@res@step
+        }
         \anchor{nobase}{
             \left
             \pgf@x=\ctikzvalof{tripoles/#1/base width}\pgf@x
@@ -5359,10 +5392,19 @@
     \pgfusepath{draw}
 
     %draw thick gate line
-    \pgfscope
+    \pgfscope%%% gate line
         \pgfpathmoveto{\pgfpoint
             {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
         {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@up+\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
+        \ifpgf@circuit@fet@doublegate
+            \edef\@@gateconnheight{(\ctikzvalof{tripoles/#1/conn height})}
+            \pgfpathlineto{\pgfpoint
+                {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
+                {\@@gateconnheight*\pgf@circ@res@up/3}}
+            \pgfpathmoveto{\pgfpoint
+                {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
+                {\@@gateconnheight*\pgf@circ@res@down/3}}
+        \fi
         \pgfpathlineto{\pgfpoint
             {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
         {\ctikzvalof{tripoles/#1/gate height}\pgf@circ@res@down-\pgfverticaltransformationadjustment*.5*\pgflinewidth}}
@@ -5404,18 +5446,28 @@
 
     % GATE CONNECTION
     \ifpgf@circuit@bpt@drawgate
-        \ifpgf@circuit@trans@ntype
-            \pgfpathmoveto{\pgfpoint
-                {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
-            {\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}}
-            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}}
-        \else
+        \pgfscope %% gate connection
+            \ifpgf@circuit@trans@ntype
+                \edef\@@gateconnheight{(\ctikzvalof{tripoles/#1/conn height})}
+            \else
+                \edef\@@gateconnheight{(-\ctikzvalof{tripoles/#1/conn height})}
+            \fi
             \pgfpathmoveto{\pgfpoint
                 {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
-            {-\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}}
-            \pgfpathlineto{\pgfpoint{\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}{-\ctikzvalof{tripoles/#1/conn height}\pgf@circ@res@down}}
-        \fi
-        \pgfusepath{draw}
+                {\@@gateconnheight*\pgf@circ@res@down}}
+            \pgfpathlineto{\pgfpoint
+                {\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
+                {\@@gateconnheight*\pgf@circ@res@down}}
+            \ifpgf@circuit@fet@doublegate
+                \pgfpathmoveto{\pgfpoint
+                    {\ctikzvalof{tripoles/#1/gate width}\pgf@circ@res@left}
+                    {-\@@gateconnheight*\pgf@circ@res@down/3}}
+                \pgfpathlineto{\pgfpoint
+                    {\pgf@circ@res@left-\pgfhorizontaltransformationadjustment*.5*\pgflinewidth}
+                    {-\@@gateconnheight*\pgf@circ@res@down/3}}
+            \fi
+            \pgfusepath{draw}
+        \endpgfscope
     \fi
 
     \pgfcirc@ferroelectric{#1}{0}
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 5743b9cfe3..fa84215e52 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,8 +10,8 @@
 %
 % See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
 
-\def\pgfcircversion{1.5.5}
-\def\pgfcircversiondate{2022/11/12}
+\def\pgfcircversion{1.6.0}
+\def\pgfcircversiondate{2022/12/10}
 \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
 
 \usemodule[tikz]
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
index 01fd355c75..9c8d32bade 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/README.md
@@ -9,13 +9,25 @@
 
 Argüelles is a beamer theme that helps you create beautiful presentations. It aims for simplicity and readability by following best practices of graphic design. The layout is elegant but subtle, so as to keep the audience's attention on your content. This is brought to life by Alegreya, one of the 53 Fonts of the Decade selected by the Association Typographique Internationale (2011).
 
-The theme requires the packages [tikz](https://ctan.org/pkg/pgf), [microtype](https://ctan.org/pkg/microtype), [Alegreya](https://ctan.org/pkg/alegreya), [euler](https://ctan.org/pkg/euler), and [fontawesome5](https://ctan.org/pkg/fontawesome5) to be installed on your computer. These are included in common LaTeX distributions, such as [MiKTeX](https://ctan.org/pkg/miktex) and [TeXLive](https://ctan.org/pkg/texlive).
+The theme requires the packages [Alegreya/AlegreyaSans](https://ctan.org/pkg/alegreya), [eulervm](https://ctan.org/pkg/eulervm), [mathalpha](https://www.ctan.org/pkg/mathalpha), [microtype](https://ctan.org/pkg/microtype), [fontawesome5](https://ctan.org/pkg/fontawesome5), [opencolor](https://www.ctan.org/pkg/opencolor), [enumitem](https://www.ctan.org/pkg/enumitem), [parskip](https://www.ctan.org/pkg/parskip), and [tikz/pgf](https://ctan.org/pkg/pgf) to be installed on your computer. These are included in common LaTeX distributions, such as [MiKTeX](https://ctan.org/pkg/miktex) and [TeXLive](https://ctan.org/pkg/texlive).
+
+### Options
+
+By default, the theme uses serif fonts for body text. Loading it with the `sans` options makes sans-serif fonts default, keeping serif only for math type. Because sans-serif font is more space-efficient, this could be useful for slides that contain more text and bullet points. See the two animations below for comparison.
+
+The `mp` option loads additional dependencies that could be useful for designing scientific presentations. These currently include [ulem](https://ctan.org/pkg/ulem), [booktabs](https://ctan.org/pkg/booktabs), [dcolumn](https://ctan.org/pkg/dcolumn), [makecell](https://ctan.org/pkg/makecell), [colortbl](https://www.ctan.org/pkg/colortbl), [cancel](https://www.ctan.org/pkg/cancel), [pgfplots](https://www.ctan.org/pkg/pgfplots) (with `compat=1.18`), and [csvsimple](https://www.ctan.org/pkg/csvsimple). In addition, the option loads the `calc` library for TikZ and the `statistics` and `fillbetween` libraries for PGFPlots.
 
 ## Demo
 
 The files `demo.tex` and `demo.pdf` demonstrate the main features of the theme.
 
-![](https://github.com/piazzai/arguelles/blob/master/demo/demo-arguelles.gif)
+### Serif
+
+![](https://github.com/piazzai/arguelles/blob/master/demo/demo-arguelles-serif.gif)
+
+### Sans-serif
+
+![](https://github.com/piazzai/arguelles/blob/master/demo/demo-arguelles-sans.gif)
 
 ## Installation
 
@@ -33,43 +45,35 @@ It is possible to change parts of the theme by altering the style files. There a
 
 ### Colors
 
-Suppose you want to change the color scheme. By default, the background consists of an off-white ([cultured](https://encycolorpedia.com/f5f5f5)) rectangle over an ink-colored ([sumi](https://encycolorpedia.com/27221f)) canvas. The color of alerted text is set to a bright red called [corsa](https://encycolorpedia.com/d40000). These color definitions are included in `beamertheme*.sty`.
-
-```tex
-\definecolor{cultured}{HTML}{f5f5f5}
-\definecolor{sumi}{HTML}{27221f}
-\definecolor{corsa}{HTML}{d40000}
-\definecolor{fern}{HTML}{4f7942}
-\definecolor{cobalt}{HTML}{0047ab}
-```
+The theme ships with the `opencolor` package, which provides color definitions for the [Open Color](https://yeun.github.io/open-color/) library. By default, the background is set to `oc-gray-0`. The foreground and body text are set to `oc-gray-9`. The color of accented text is `oc-red-9`.
 
-There are also two more colors, [fern](https://encycolorpedia.com/4f7942) and [cobalt](https://encycolorpedia.com/0047ab), which are currently unused in the design. If you wanted one of these to be the color of alerted text, then you would open `beamercolortheme*.sty` and look for:
+These settings are provided in `beamercolortheme*.sty` and can be customized using any default or opencolor name. For example:
 
 ```tex
-\setbeamercolor*{alerted text}{fg=corsa}
+\setbeamercolor*{structure}{bg=oc-blue-0,fg=black!80}
 ```
 
-Change `corsa` to some other color and you are set. Similar changes can be made to tweak the color of normal text, the background, or any other element of the layout. Of course, you can also define your own colors.
+See the opencolor documentation for additional details.
 
 ### Font weights
 
-It is possible to change font styles and weights. Alegreya is a comprehensive family and comes with a variety of weights, as does its sister family Alegreya Sans. In addition to the usual bold set by `\bfseries`, Alegreya comes in medium, extra bold, and black. Alegreya Sans further comes in light and thin. These weights are set by commands like `\AlegreyaExtraBold` or `\AlegreyaSansThin` (see the [Alegreya README](https://mirrors.dotsrc.org/ctan/fonts/alegreya/README) for more details), and can be combined with `\scshape` or `\itshape` to produce a variety of effects.
+Alegreya is a comprehensive family and comes with a variety of weights, as does its sister family Alegreya Sans. In addition to the usual bold provided by `\bfseries`, Alegreya comes in medium, extra bold, and black. Alegreya Sans further comes in light and thin. These weights are set by commands like `\AlegreyaExtraBold` or `\AlegreyaSansThin`, as explained in the Alegreya documentation, and can be combined with `\scshape` or `\itshape` to produce a variety of effects.
 
-The file `beamerfonttheme*.sty` sets the type for various elements of the layout. For example, the appearance of frame titles is determined by the following command:
+The file `beamerfonttheme*.sty` sets the type for various elements of the layout. For example, the appearance of frame titles is determined by the command:
 
 ```tex
 \setbeamerfont{frame title}{size=\Large}
 ```
 
-If you wanted to give frame titles a little bit more weight, you could write `{series=\AlegreyaMedium,size=\Large}`. If you wanted to make them slightly larger, you could change `\Large` to `\LARGE`.
+If you wanted to give frame titles a little bit more weight, you could write `series=\AlegreyaMedium` and `size=\Large`. If you wanted to make them slightly larger, you could write `size=\LARGE`.
 
-By default, the theme uses serif type for most text and reserves sans-serif type for the presentation title, formatted in black weight, and URLs. It is possible to alter this behavior by modifying `beamerfonttheme*.sty`. For example, the appearance of the presentation title is determined by:
+By default, the theme uses serif type for body text and reserves sans-serif type for the presentation title, formatted in black weight. It is possible to modify this behavior by rewriting parts of `beamerfonttheme*.sty`. For example, the appearance of the presentation title is determined by:
 
 ```tex
 \setbeamerfont{title}{series=\AlegreyaSansBlack,size=\LARGE}
 ```
 
-Changing `\AlegreyaSansBlack` to `\AlegreyaBlack` in this command makes the title serif like any other text. Deleting `\usefonttheme{serif}` near the top of the style file makes sans-serif type the new default for all text. Changing `\urlstyle{sf}` to `\urlstyle{same}` makes URLs appear like normal text, and deleting the line altogether resets them to true type.
+Changing `\AlegreyaSansBlack` to `\AlegreyaBlack` in this line sets the title to serif, keeping the same weight. Deleting `\usefonttheme{serif}` near the top of the file makes sans-serif type the new default for all text. Changing `\urlstyle{same}` to `\urlstyle{sf}` makes URLs sans-serif, and deleting the line altogether resets them to true type.
 
 ### Figures
 
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/VERSION b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/VERSION
deleted file mode 100644
index 52669afa94..0000000000
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v1.2.2 2022-06-22
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
index 7cb4cd531a..c47a3f614a 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamercolorthemeArguelles.sty
@@ -1,16 +1,20 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamercolorthemeArguelles}[2022/12/10 Argüelles]
 
 \mode<presentation>
 
-% Settings
-\setbeamercolor*{background canvas}{bg=sumi}
-\setbeamercolor*{structure}{bg=cultured,fg=sumi}
-\setbeamercolor*{section in head/foot}{bg=sumi,fg=cultured}
-\setbeamercolor*{normal text}{fg=sumi}
-\setbeamercolor*{inverted text}{fg=cultured}
-\setbeamercolor*{alerted text}{fg=corsa}
+% color scheme
+\setbeamercolor*{structure}{bg=oc-gray-0,fg=oc-gray-9}
+\setbeamercolor*{background canvas}{bg=structure.fg}
+\setbeamercolor*{section in head/foot}{bg=structure.fg,fg=structure.bg}
+\setbeamercolor*{normal text}{fg=oc-gray-8}
+\setbeamercolor*{inverted text}{fg=oc-gray-0}
+\setbeamercolor*{alerted text}{fg=oc-red-9}
 
 \mode<all>
+\endinput
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
index 57ea2fcd98..7f65d14dfd 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerfontthemeArguelles.sty
@@ -1,21 +1,30 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerfontthemeArguelles}[2022/12/10 Argüelles]
 
 \mode<presentation>
 
-\usefonttheme{serif}
-\urlstyle{sf}
+% set url style
+\urlstyle{same}
 
-% Settings
+% title page elements
 \setbeamerfont{title}{series=\AlegreyaSansBlack,size=\LARGE}
-\setbeamerfont{subtitle}{series=\Alegreya\bfseries,size=\Large}
+\setbeamerfont{subtitle}{series=\AlegreyaSansMedium,size=\Large}
+\setbeamerfont{event}{series=\itshape}
 \setbeamerfont{date}{series=\itshape}
 \setbeamerfont{author}{series=\bfseries,size=\large}
 \setbeamerfont{institute}{size=\small}
-\setbeamerfont{headline section}{series=\scshape}
-\setbeamerfont{frame title}{size=\Large}
-\setbeamerfont{frame subtitle}{size=\large}
+\setbeamerfont{email}{size=\small}
+
+% frame elements
+\setbeamerfont{headline section}{series=\AlegreyaSans\scshape}
+\setbeamerfont{frame title}{series=\mediumfont,size=\Large}
+\setbeamerfont{frame subtitle}{series=\mediumfont,size=\large}
+\setbeamerfont{block title}{series=\mediumfont\itshape}
 
 \mode<all>
+\endinput
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
index 7ea5be490c..09465ef23b 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerinnerthemeArguelles.sty
@@ -1,40 +1,78 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerinnerthemeArguelles}[2022/12/10 Argüelles]
 
 \mode<presentation>
 
-% Settings
-\setbeamertemplate{itemize item}{$\bullet$}
-\setbeamertemplate{itemize subitem}{$\circ$}
-\setbeamertemplate{itemize subsubitem}{\textbullet}
+% additional title page fields
+\def\insertevent{}
+\newcommand{\event}[1]{
+  \def\insertevent{#1}
+}
+\def\insertemail{}
+\newcommand{\email}[1]{
+  \def\insertemail{\href{mailto:#1}{\raisebox{-.1em}{\faIcon{envelope}}\hspace{.3em}#1}}
+}
+
+% title page
+\defbeamertemplate*{title page}{Arguelles}{
+ \vfill\begin{beamercolorbox}{inverted text}
+  {\usebeamerfont{title}\inserttitle}\par
+  {\usebeamerfont{subtitle}\insertsubtitle}\par\bigskip
+  {\usebeamerfont{event}\insertevent}\par
+  {\usebeamerfont{date}\insertdate}\par\bigskip
+  {\usebeamerfont{author}\insertauthor}\par\smallskip
+  {\usebeamerfont{institute}\insertinstitute}\par
+  {\usebeamerfont{email}\insertemail}
+ \end{beamercolorbox}
+}
+
+% lists
+\setlist{nosep,leftmargin=*}
+\setlist[1]{labelindent=\parindent,itemsep=.5em}
+\setlist[2]{before=\small}
+\setlist[itemize,1]{label=$\bullet$}
+\setlist[itemize,2]{label=$\circ$}
+\setlist[itemize,3]{label=$\cdot$}
+\setlist[enumerate,1]{label=\arabic*.}
+\setlist[enumerate,2]{label=\theenumi\arabic*.}
+\setlist[enumerate,3]{label=\theenumii\arabic*.}
+\setlist[description]{font=\normalfont\itshape,style=multiline}
+
+% blocks
 \setbeamertemplate{blocks}[rounded]
 
-% Background
+% background
 \BeforeBeginEnvironment{frame}{
  \setbeamertemplate{background}{
   \begin{tikzpicture}
-   \useasboundingbox (0,0) rectangle (\the\paperwidth,\the\paperheight);
+   \useasboundingbox (0,0) rectangle (\paperwidth,\paperheight);
    \ifnum\thepage>1\relax
-    \fill[cultured] (0,.2em) rectangle (\the\paperwidth,\the\paperheight-.2em);
+    \fill[structure.bg] (0,.01\paperheight) rectangle (\paperwidth,.99\paperheight);
    \fi
   \end{tikzpicture}
  }
 }
 
-% Title page
-\defbeamertemplate*{title page}{Arguelles}{
- \vfill\begin{beamercolorbox}{inverted text}
-  {\usebeamerfont{title}\inserttitle}\par
-  {\usebeamerfont{subtitle}\insertsubtitle}\par\bigskip
-  {\usebeamerfont{date}\insertdate}\par\bigskip
-  {\usebeamerfont{author}\insertauthor}\par\smallskip
-  {\usebeamerfont{institute}\insertinstitute}
- \end{beamercolorbox}
+% fullscreen image
+\newcommand{\fillpicture}[1]{
+    \centering
+    \ifbeamer@plainframe
+    \tikz[remember picture,overlay] \node[inner sep=0pt] at (current page.center) {
+        \includegraphics[width=\paperwidth,height=.98\paperheight]{#1}
+        };
+    \else
+    \tikz[remember picture,overlay] \node[inner sep=0pt] at ($(current page.north)-(0,.526\paperheight)$) {
+        \includegraphics[width=\paperwidth,height=.929\paperheight]{#1}
+        };
+    \fi
 }
 
-% Standout frame
+% standout frame
 \providebool{Arguelles@standout}
 \define@key{beamerframe}{standout}[true]{
  \booltrue{Arguelles@standout}
@@ -43,7 +81,7 @@
  \beamer@frametopskip=0pt plus 1fill\relax%
  \beamer@framebottomskip=0pt plus 1.25fill\relax%
  \color{structure.bg}
- \large\centering
+ \large
 }
 \pretocmd{\beamer@reseteecodes}{
  \ifbool{Arguelles@standout}{
@@ -52,3 +90,4 @@
 }{}{}
 
 \mode<all>
+\endinput
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
index 8d1ce4915a..22f16c50d1 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerouterthemeArguelles.sty
@@ -1,21 +1,24 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerouterthemeArguelles}[2022/12/10 Argüelles]
 
 \mode<presentation>
 
-% Settings
+% remove navigation symbols
 \setbeamertemplate{navigation symbols}{}
 
-% Headline navigation
+% headline navigation
 \defbeamertemplate*{headline}{Arguelles}{
  \begin{beamercolorbox}[ht=1.2em,dp=1.6em]{section in head/foot}
   {\usebeamerfont{headline section}\insertnavigation{\paperwidth}}
  \end{beamercolorbox}
 }
 
-% Frame title
+% frame title
 \defbeamertemplate*{frametitle}{Arguelles}{
  \begin{beamercolorbox}[wd=.95\paperwidth]{normal text}
   {\usebeamerfont{frame title}\insertframetitle}\hfill
@@ -24,3 +27,4 @@
 }
 
 \mode<all>
+\endinput
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
index 9774b62c8c..71694847ef 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/beamerthemeArguelles.sty
@@ -1,37 +1,72 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerthemeArguelles}[2022/12/10 Argüelles]
 
 \mode<presentation>
 
-% Requirements
+% dependencies
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
 \RequirePackage[osf]{Alegreya}
 \RequirePackage[osf]{AlegreyaSans}
-\RequirePackage{euler}
-\RequirePackage{microtype}
+\RequirePackage[euler-hat-accent]{eulervm}
+\RequirePackage[bb=px]{mathalpha}
+\RequirePackage[nopatch=footnote]{microtype}
 \RequirePackage{fontawesome5}
+\RequirePackage{opencolor}
+\RequirePackage{enumitem}
+\RequirePackage{parskip}
 \RequirePackage{tikz}
 
-% Settings
+% components
 \useinnertheme{Arguelles}
 \useoutertheme{Arguelles}
 \usecolortheme{Arguelles}
 \usefonttheme{Arguelles}
 
-% TikZ
+\newif\if@optSans
+\@optSansfalse
+\DeclareOption{sans}{\@optSanstrue}
+\newif\if@optMp
+\@optMpfalse
+\DeclareOption{mp}{\@optMptrue}
+\ProcessOptions
+
+\if@optSans
+\usefonttheme[onlymath]{serif}
+\newcommand\mediumfont{\AlegreyaSansMedium}
+\else
+\usefonttheme{serif}
+\newcommand\mediumfont{\AlegreyaMedium}
+\fi
+
+\if@optMp
+\RequirePackage[normalem]{ulem}
+\RequirePackage{booktabs}
+\RequirePackage{dcolumn}
+\RequirePackage{makecell}
+\RequirePackage{colortbl}
+\RequirePackage{cancel}
+\RequirePackage{pgfplots}
+\RequirePackage{csvsimple}
+
+% tikz options
 \usetikzlibrary{calc}
 
-\definecolor{cultured}{HTML}{f5f5f5}
-\definecolor{sumi}{HTML}{27221f}
-\definecolor{corsa}{HTML}{d40000}
-\definecolor{fern}{HTML}{4f7942}
-\definecolor{cobalt}{HTML}{0047ab}
+% pgfplots options
+\pgfplotsset{compat=1.18}
+\usepgfplotslibrary{statistics,fillbetween}
+\fi
 
 \AtBeginEnvironment{proof}{\let\@addpunct\@gobble}
-\newcommand\email[1]{\href{mailto:#1}{\faEnvelope\hspace{.3em}\sffamily #1}}
-\newcommand\Section[1]{\section{\lowercase{#1}}}
-\renewcommand{\appendixname}{}
-\newcommand\ThankYou{\appendix}
+
+\newcommand\Section[1]{\section{\texorpdfstring{\lowercase{#1}}{#1}}}
+\newcommand\End{\appendix}
+\renewcommand{\appendixname}{End}
 
 \mode<all>
+\endinput
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-sans.gif b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-sans.gif
new file mode 100644
index 0000000000..cd53a67138
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-sans.gif
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-serif.gif b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-serif.gif
new file mode 100644
index 0000000000..ac112eccad
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles-serif.gif
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.gif b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.gif
deleted file mode 100644
index a80fc74e45..0000000000
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.gif
+++ /dev/null
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
index 8e75f2e2d9..85ee585794 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.pdf
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
index 3c60d44700..00459fe223 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-arguelles/demo/demo-arguelles.tex
@@ -1,19 +1,19 @@
-% Argüelles v1.2.2
-% Copyright (c) 2020 Michele Piazzai. Contact: michele.piazzai@uc3m.es
-% This work is released under the MIT License and is free to use, copy, modify,
-% merge, publish, distribute, sublicense, and/or sell. See LICENSE for details.
+% arguelles v2.0.0
+% author: Michele Piazzai
+% contact: michele.piazzai@uc3m.es
+% license: MIT
 
-\documentclass[compress]{beamer}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
+\documentclass[compress,12pt]{beamer}
 
 \usetheme{Arguelles}
 
 \title{Argüelles}
 \subtitle{Simple, typographic beamer theme}
+\event{}
 \date{}
 \author{Place Holder}
-\institute{University of \TeX \par \email{username@domain.com}}
+\institute{University of \TeX}
+\email{username@domain.com}
 
 \begin{document}
 
@@ -22,82 +22,83 @@
 \Section{Demo}
 
 \begin{frame}
- \frametitle{A frame with title and subtitle}
- \framesubtitle{The subtitle goes here}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\par
- \vfill
- Ordered list:
- \begin{enumerate}
-  \item First item
-  \item Second item
-  \item Third item
- \end{enumerate}
- \vfill
- Unordered list:
- \begin{itemize}
-  \item First level
-        \begin{itemize}
-         \item Second level
-               \begin{itemize}
-                \item Third level
-               \end{itemize}
-        \end{itemize}
- \end{itemize}
+      \frametitle{A frame with title and subtitle}
+      \framesubtitle{Subtitle here}
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua \par
+      Itemized list:
+      \begin{itemize}
+            \item Lorem ipsum
+            \item Dolor sit amet
+                  \begin{itemize}
+                        \item Consectetur
+                        \item Adipiscing elit
+                  \end{itemize}
+            \item Sed do eiusmod
+                  \begin{itemize}
+                        \item Tempor incididunt
+                              \begin{itemize}
+                                    \item Ut labore et dolore
+                                    \item Magna aliqua
+                              \end{itemize}
+                  \end{itemize}
+      \end{itemize}
 \end{frame}
 
 \begin{frame}
- \frametitle{A frame with title only}
- \begin{theorem}
-  \[e^{i\pi}+1=0\]
-  \begin{proof}
-   \begin{equation*}
-    e^{iz}=\cos{z}+i\sin{z}
-   \end{equation*}
-   \center{therefore}
-   \begin{align*}
-    e^{i\pi}+1 & \null=\cos\pi+i\sin\pi+1 \\
-               & \null=-1+i\times0+1      \\
-               & \null=0                  
-   \end{align*}
-  \end{proof}
- \end{theorem}
+      \frametitle{A frame with title only}
+      \begin{theorem}
+            \[e^{i\pi}+1=0\]
+            \begin{proof}
+                  \begin{equation*}
+                        e^{iz}=\cos{z}+i\sin{z}
+                  \end{equation*}
+                  \center{therefore}
+                  \begin{align*}
+                        e^{i\pi}+1 & \null=\cos\pi+i\sin\pi+1 \\
+                                   & \null=-1+i\times0+1      \\
+                                   & \null=0
+                  \end{align*}
+            \end{proof}
+      \end{theorem}
 \end{frame}
 
 \begin{frame}[plain]
- \frametitle{A plain frame has no headline}
- \begin{table}
-  \small
-  \begin{tabular}{rl}
-   \ttfamily\textbackslash Alegreya              & \Alegreya Lorem ipsum dolor sit amet              \\
-   \ttfamily\textbackslash AlegreyaExtraBold     & \AlegreyaExtraBold Lorem ipsum dolor sit amet     \\
-   \ttfamily\textbackslash AlegreyaBlack         & \AlegreyaBlack Lorem ipsum dolor sit amet         \\
-   \ttfamily\textbackslash AlegreyaMedium        & \AlegreyaMedium Lorem ipsum dolor sit amet        \\
-   \ttfamily\textbackslash AlegreyaSans          & \AlegreyaSans Lorem ipsum dolor sit amet          \\
-   \ttfamily\textbackslash AlegreyaSansThin      & \AlegreyaSansThin Lorem ipsum dolor sit amet      \\
-   \ttfamily\textbackslash AlegreyaSansLight     & \AlegreyaSansLight Lorem ipsum dolor sit amet     \\
-   \ttfamily\textbackslash AlegreyaSansMedium    & \AlegreyaSansMedium Lorem ipsum dolor sit amet    \\
-   \ttfamily\textbackslash AlegreyaSansExtraBold & \AlegreyaSansExtraBold Lorem ipsum dolor sit amet \\
-   \ttfamily\textbackslash AlegreyaSansBlack     & \AlegreyaSansBlack Lorem ipsum dolor sit amet     
-  \end{tabular}
- \end{table}
- \vfill
- \begin{alert}{Alert!}
-  A \textit{plain} frame does not show the progress bar but it still appears in the progress bar of other frames unless it is placed after \texttt{\textbackslash ThankYou}.
- \end{alert}
+      \frametitle{A plain frame has no headline}
+      \begin{table}
+            \small
+            \begin{tabular}{rl}
+                  \ttfamily\textbackslash Alegreya              & \Alegreya Lorem ipsum dolor sit amet              \\
+                  \ttfamily\textbackslash AlegreyaMedium        & \AlegreyaMedium Lorem ipsum dolor sit amet        \\
+                  \ttfamily\textbackslash AlegreyaExtraBold     & \AlegreyaExtraBold Lorem ipsum dolor sit amet     \\
+                  \ttfamily\textbackslash AlegreyaBlack         & \AlegreyaBlack Lorem ipsum dolor sit amet         \\
+                  \ttfamily\textbackslash AlegreyaSansThin      & \AlegreyaSansThin Lorem ipsum dolor sit amet      \\
+                  \ttfamily\textbackslash AlegreyaSansLight     & \AlegreyaSansLight Lorem ipsum dolor sit amet     \\
+                  \ttfamily\textbackslash AlegreyaSans          & \AlegreyaSans Lorem ipsum dolor sit amet          \\
+                  \ttfamily\textbackslash AlegreyaSansMedium    & \AlegreyaSansMedium Lorem ipsum dolor sit amet    \\
+                  \ttfamily\textbackslash AlegreyaSansExtraBold & \AlegreyaSansExtraBold Lorem ipsum dolor sit amet \\
+                  \ttfamily\textbackslash AlegreyaSansBlack     & \AlegreyaSansBlack Lorem ipsum dolor sit amet
+            \end{tabular}
+      \end{table}
+      \vfill
+      \begin{alert}{Alert!}
+            A \textit{plain} frame does not show the progress bar but still appears in it unless the frame comes after \texttt{\textbackslash End}
+      \end{alert}
 \end{frame}
 
 \begin{frame}[standout]
- \Large
- A \textbf{\itshape\scshape standout} frame can be used to focus attention
+      \centering\large
+      A \textbf{\itshape\scshape standout} frame can be used to focus attention
 \end{frame}
 
-\ThankYou
+\End
 \begin{frame}[plain,standout]
- In combination with \textit{plain},\par
- it makes a nice thank-you slide!
- \vfill\scalebox{4}{\faGithub}\par\bigskip
- \url{https://github.com/piazzai/arguelles} \\
- \url{https://ctan.org/pkg/beamertheme-arguelles}
+      \centering
+      In combination with \textit{plain}, \\
+      it makes a nice thank-you slide!
+      \vfill
+      \scalebox{4}{\faGithub} \par\bigskip
+      \url{https://github.com/piazzai/arguelles} \\
+      \url{https://ctan.org/pkg/beamertheme-arguelles}
 \end{frame}
 
 \end{document}
diff --git a/macros/latex/contrib/mindflow/mindflow.dtx b/macros/latex/contrib/mindflow/mindflow.dtx
index 221a7e3c78..b96d4816b3 100644
--- a/macros/latex/contrib/mindflow/mindflow.dtx
+++ b/macros/latex/contrib/mindflow/mindflow.dtx
@@ -18,7 +18,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{mindflow}
 %<*package>
-    [2022/01/31 The mindflow environment]
+    [2022/12/06 The mindflow environment]
 %</package>
 %
 %<*driver>
@@ -37,7 +37,7 @@
 \setlist[itemize,1]{label=\textcolor{black!55}{$\bullet$}}
 \usepackage{newpxtext}
 \useosf
-\usepackage{amssymb}
+\usepackage{mathtools,amssymb}
 \usepackage[euler-digits]{eulervm}
 % \usepackage{ebgaramond,ebgaramond-maths}
 \usepackage[symbol]{footmisc}
@@ -79,14 +79,13 @@
     if@twocolumn,
     ifICturnsON,ICturnsONtrue,ICturnsONfalse,AutoIncolumn,ResumeIncolumn,
     newtcolorbox,
-    ifdefined,linenomathpatch,cspreto,csappto,patchcmd,linenomathpatchAMS,linenomathAMS,linenomathWithnumbers,linenomath,endlinenomath,linenomathNonumbers,linenopenalty,
     define@key,setkeys,
     nowidow,
     }
 }
 \lstnewenvironment{code*}% 
 {\setkeys{lst}{columns=fullflexible,keepspaces=true}}{}
-\lstnewenvironment{code}% 
+\lstnewenvironment{code-with-linenumber}% 
 {\setkeys{lst}{columns=fullflexible,keepspaces=true,numbers=left,numberstyle=\scriptsize, stepnumber=1, numbersep=5pt,lastline=236}}{}
 \EnableCrossrefs
 \CodelineIndex
@@ -105,7 +104,7 @@
 % \title{{\huge\scshape\textsf{mindflow}}\\[.15\baselineskip]\itshape\large write your ideas in a clear way\smallskip}
 % \author{\scshape Jinwen XU}
 % \footnotetext{\hspace*{-1em}Corresponding to: \textsf{mindflow} \ttfamily\filedate}
-% \date{\normalsize January 2022, in Paris}
+% \date{\normalsize December 2022, in Paris}
 %
 % \maketitle
 %
@@ -364,7 +363,7 @@
 % \section{Implementation}
 % Below is the complete source code of this package.
 %
-% \begin{code}
+% \begin{code-with-linenumber}
 \RequirePackage{kvoptions}
 \SetupKeyvalOptions{%
     family = @mindflow,
@@ -396,7 +395,7 @@
 %%================================
 %% Initialization
 %%================================
-\RequirePackage{linenoamsmath}
+\RequirePackage{lineno}
 \RequirePackage{xcolor}
 
 \colorlet{mfSavedColor}{.}
@@ -601,7 +600,7 @@
 \newcommand{\mindflowset}[1]{%
   \setkeys{mindflow}{#1}%
 }
-% \end{code}
+% \end{code-with-linenumber}
 %
 % \Finale
 \endinput
diff --git a/macros/latex/contrib/mindflow/mindflow.pdf b/macros/latex/contrib/mindflow/mindflow.pdf
index b702a90053..8b0a70250d 100644
--- a/macros/latex/contrib/mindflow/mindflow.pdf
+++ b/macros/latex/contrib/mindflow/mindflow.pdf
diff --git a/macros/latex/contrib/nicefilelist/README b/macros/latex/contrib/nicefilelist/README
index 6b2707e7bd..ab4964ab74 100644
--- a/macros/latex/contrib/nicefilelist/README
+++ b/macros/latex/contrib/nicefilelist/README
@@ -1,35 +1,37 @@
-
             README for the `nicefilelist' package
-      \listfiles Alignment with Date and Version Columns
-                  (C) Uwe Lueck 2012/10/30
-
-
-While `longnamefilelist.sty' improves LaTeX's \listfiles with 
-respect to long base filenames only, the present `nicefilelist.sty' 
-can keep separate columns for 
-(i) date (ii) version, and (iii) "caption" 
-(don't write caption text in date column), 
-their alignment not being disturbed by short filename extensions 
+     \listfiles Alignment with Date and Version Columns
+         © Uwe Lück 2012/10/30 (deceased June 2020,
+        2022-12-05 v0.8a patched by H.-Martin Münch,
+     original package version 0.7a has been archived at
+         https://web.archive.org/web/20221205210517/
+          https://mirror.mwt.me/ctan/install/macros/
+          latex/contrib/nicefilelist.tds.zip)
+
+While `longnamefilelist.sty' improves LaTeX's \listfiles with
+respect to long base filenames only, the present `nicefilelist.sty'
+can keep separate columns for
+(i) date (ii) version, and (iii) "caption"
+(don't write caption text in date column),
+their alignment not being disturbed by short filename extensions
 such as `.fd'. This is achieved basing on the `monofill' package.
 
-v0.7 offers a package option `[wrap]' for automatic word wrapping 
-within the caption column, using the `hardwrap' package, so 
-filenames and captions can be quite long without disturbing the 
-alignment.
+v0.7 offers a package option `[wrap]' for automatic word wrapping
+within the caption column, using the `hardwrap' package,
+so filenames and captions can be quite long without disturbing
+the alignment.
 
-As opposed to the `dateiliste' package, this is about the plain 
+As opposed to the `dateiliste' package, this is about the plain
 text output in the `.log' file or, with `myfilist', as a stand-
 alone plain text file.
 
 The package `latexfileinfo-pkgs'
 
-    http://ctan.org/pkg/latexfileinfo-pkgs
+    https://ctan.org/pkg/latexfileinfo-pkgs
 
-describes `nicefilelist' in a more general context. A file 
-`nicefilelist.RLS' provides release information accessible by 
+describes `nicefilelist' in a more general context. A file
+`nicefilelist.RLS' provides release information accessible by
 packages described there.
 
-
 LICENSE:
 
 The package file `nicefilelist.sty' and the documentation files
@@ -37,9 +39,9 @@ The package file `nicefilelist.sty' and the documentation files
 modified under the terms of the LaTeX Project Public License;
 either version 1.3c of the License, or any later version, see
 
-    http://www.latex-project.org/lppl.txt
+    https://www.latex-project.org/lppl.txt
 
-There is NO WARRANTY -- no responsibility can be accepted 
+There is NO WARRANTY -- no responsibility can be accepted
 when your monitor bursts.
 
 The `nicefilelist' package is author-maintained in the sense of
@@ -47,14 +49,8 @@ this license.
 
 The latest public version of the package is available at
 
-    http://mirror.ctan.org/macros/latex/contrib/nicefilelist/
+    https://mirror.ctan.org/macros/latex/contrib/nicefilelist/
 
 A TDS version of the package is available as
 
-    http://mirror.ctan.org/install/macros/latex/contrib/nicefilelist.tds.zip
-
-Please report bugs, problems, suggestions, and bad English via
-
-    http://www.contact-ednotes.sty.de.vu
-
-
+    https://mirror.ctan.org/install/macros/latex/contrib/nicefilelist.tds.zip
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt b/macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
index 193b1ad9de..6209222cfb 100644
--- a/macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
+++ b/macros/latex/contrib/nicefilelist/doc/SrcFILEs.txt
@@ -1,12 +1,11 @@
-
      *File List*
 -----RELEASE.---   --  -- --   --     -- 
-nicefilelist.RLS  2012/12/12  v0.7a  [wrap], `mono' typo, vs.
+nicefilelist.RLS  2022/12/05  v0.8a  date: dashes OK
 -----PACKAGE.---   --  -- --   --     -- 
-nicefilelist.sty  2012/12/12  v0.7a  more file list alignment (UL)
+nicefilelist.sty  2022/12/05  v0.8a  more file list alignment (UL)
 ------DOCSRC.---   --  -- --   --     -- 
-nicefilelist.tex  2012/12/12   --    documenting nicefilelist.sty
-    srcfiles.tex  2012/10/30   --    file infos -> SrcFILEs.txt
+nicefilelist.tex  2022/12/05   --    documenting nicefilelist.sty
+    srcfiles.tex  2022/12/05   --    file infos -> SrcFILEs.txt
 --------DEMO.---   --  -- --   --     -- 
     provonly.fd    --  -- --   --    no date, no version, but a lot of info,
                                      look how that is wrapped!
@@ -18,15 +17,13 @@ nicefilelist.tex  2012/12/12   --    documenting nicefilelist.sty
     readprov.sty  2012/11/22  v0.5   file infos without loading (UL)
     fifinddo.sty  2012/11/17  v0.61  filtering TeX(t) files by TeX (UL)
      makedoc.sty  2012/08/28  v0.52  TeX input from *.sty (UL)
-    niceverb.sty  2012/11/27  v0.51  minimize doc markup (UL)
-    texlinks.sty  2012/12/08  v0.71  TeX-related links (UL)
-     makedoc.cfg  2012/11/30   --    documentation settings
+    niceverb.sty  2015/11/21  v0.62  minimize doc markup (UL)
+    texlinks.sty  2015/07/20  v0.83  TeX-related links (UL)
+     makedoc.cfg  2013/03/25   --    documentation settings
     mdoccorr.cfg  2012/11/13   --    `makedoc' local typographical corrections
 -not-so-much.---   --  -- --   --     -- 
-   kvsetkeys.sty  2009/07/30  v1.5   Key value parser with default handler
-                                     support (HO)
+   kvsetkeys.sty  2019/12/15  v1.18  Key value parser (HO)
      ***********
 
- List made at 2012/12/12, 23:52
- from script file srcfiles.tex
-
+ List made at 2022/12/05, 16:05
+ from script file srcfiles.tex
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS b/macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
index 42734de895..a40c48ea2b 100644
--- a/macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
+++ b/macros/latex/contrib/nicefilelist/doc/nicefilelist.RLS
@@ -1,4 +1,5 @@
 \ProvidesFile{nicefilelist.RLS}     %% RELEASE INFO
+   [{2022/12/05 v0.8a      date: dashes OK}]
    [{2012/12/12 v0.7a      [wrap], `mono' typo, vs.}]
    [{2012/10/30 r0.7 v0.7  [wrap] option}]
    [{2012/10/11 r0.6 v0.6 \string\MaxBaseEmptyList*}]
@@ -6,4 +7,4 @@
     [{2012/05/20 r0.4 v0.4 Kabelschacht + [r] }]
     [2012/05/20 v0.3 Kabelschacht reimplementation]
     [2012/03/29 v0.2 reimpl.: much within \string\typeout]
-    [2012/03/23 v0.1(a) initial]
+    [2012/03/23 v0.1(a) initial]
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf b/macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
index ebf7a8743e..ec61c39601 100644
--- a/macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
+++ b/macros/latex/contrib/nicefilelist/doc/nicefilelist.pdf
diff --git a/macros/latex/contrib/nicefilelist/docsrc/provonly.fd b/macros/latex/contrib/nicefilelist/docsrc/provonly.fd
deleted file mode 100644
index 52aa2c3604..0000000000
--- a/macros/latex/contrib/nicefilelist/docsrc/provonly.fd
+++ /dev/null
@@ -1,4 +0,0 @@
-%\ProvidesFile{provonly.fd}[2012/03/22 v0.11a such]
-%\ProvidesFile{provonly.fd}[such]
-\ProvidesFile{provonly.fd}[no date, no version, but a lot of info,
-                           look how that is wrapped!]
diff --git a/macros/latex/contrib/nicefilelist/docsrc/wrong.prv b/macros/latex/contrib/nicefilelist/docsrc/wrong.prv
deleted file mode 100644
index 166454f5c8..0000000000
--- a/macros/latex/contrib/nicefilelist/docsrc/wrong.prv
+++ /dev/null
@@ -1 +0,0 @@
-\ProvidesFile{diffname.prv}[2012/03/23 v0.1 wrong]
diff --git a/macros/latex/contrib/nicefilelist/docsrc/empty.f b/macros/latex/contrib/nicefilelist/source/empty.f
index e69de29bb2..e69de29bb2 100644
--- a/macros/latex/contrib/nicefilelist/docsrc/empty.f
+++ b/macros/latex/contrib/nicefilelist/source/empty.f
diff --git a/macros/latex/contrib/nicefilelist/docsrc/nicefilelist.tex b/macros/latex/contrib/nicefilelist/source/nicefilelist.tex
index 8cb9643857..61681852f7 100644
--- a/macros/latex/contrib/nicefilelist/docsrc/nicefilelist.tex
+++ b/macros/latex/contrib/nicefilelist/source/nicefilelist.tex
@@ -1,4 +1,4 @@
-\ProvidesFile{nicefilelist.tex}[2012/12/12 documenting nicefilelist.sty]
+\ProvidesFile{nicefilelist.tex}[2022/12/05 documenting nicefilelist.sty]
 \title{\pkg{\huge nicefilelist.sty
        }\\---\\\cs{listfiles} Alignment for Connoisseurs\thanks{This
        document describes version
@@ -9,7 +9,7 @@
   {\SectionLevelTwoParseInput}  }
 \documentclass[fleqn]{article}%% TODO paper dimensions!?
 \input{makedoc.cfg} %% shared formatting settings
-\usepackage[wrap]{nicefilelist} \listfiles 
+\usepackage[wrap]{nicefilelist} \listfiles
 %% <- 2012/10/30 try without 'myfilist'
 \MDkeywords{Package management, document management, plain text output}
 \sloppy
@@ -18,83 +18,82 @@
 \begin{MDabstract}
 While \CtanPkgRef{longnamefilelist}{longnamefilelist.sty}
 improves \LaTeX's \cs{listfiles} with respect to long base filenames only,
-'nicefilelist.sty' can keep separate columns for 
+'nicefilelist.sty' can keep separate columns for
 (i)~date, (ii)~version, and (iii)~``caption"    %% 1st , 2012/10/30
-(don't write caption text in date column), 
-their alignment not being disturbed by short filename extensions such as `.fd'. 
+(don't write caption text in date column),
+their alignment not being disturbed by short filename extensions such as `.fd'.
 This is achieved basing on the \ctanpkgref{monofill} package.
 
-% Thus 'nicefilelist' is more ``powerful" than 'longnamefilelist', 
-% the former however is an ``extension" of the latter 
+% Thus 'nicefilelist' is more ``powerful" than 'longnamefilelist',
+% the former however is an ``extension" of the latter
 % neither with respect to implementation nor with respect to user interface.
 
 %% <- 2012/10/29 ->
-v0.7 offers a package option `[wrap]' for automatic word wrapping within 
-the caption column (using the \ctanpkgref{hardwrap} package), 
+v0.7 offers a package option `[wrap]' for automatic word wrapping within
+the caption column (using the \ctanpkgref{hardwrap} package),
 so filenames and captions can be quite long without disturbing alignment.
 
-As opposed to the \ctanpkgref{dateiliste} package, this is about the 
-\meta{plain text} output in the `.log' file or, with \ctanpkgref{myfilist}, 
+As opposed to the \ctanpkgref{dateiliste} package, this is about the
+\meta{plain text} output in the `.log' file or, with \ctanpkgref{myfilist},
 as a stand-alone plain text file.
 
 \MDaddtoabstract{Related packages:} Cf.~\ctanpkgref{latexfileinfo-pkgs}.
 \end{MDabstract}
 \tableofcontents
 \section{Features and Usage}
-% We are describing relations to, ahm, related packages---rather brief{}ly. 
+% We are describing relations to, ahm, related packages---rather brief{}ly.
 % The \ctanpkgref{latexfileinfo-pkgs} package provides a more general overview.
 % %% <- 2012/05/18
 %% 2012/10/29:
-Additionally or also ``complementarily" to the presentation given here, 
-the functionality of the package is summarized in the file 
+Additionally or also ``complementarily" to the presentation given here,
+the functionality of the package is summarized in the file
 `latexfileinfo_pkgs.htm' from the \ctanpkgref{latexfileinfo-pkgs},
-in a comparison with packages resembling 'nicefilelist' in 
+in a comparison with packages resembling 'nicefilelist' in
 certain respects.
 
 \subsection{Relation to 'longnamefilelist.sty'}
-\CtanPkgRef{longnamefilelist}{longnamefilelist.sty} equips 
-\cs{listfiles} with an optional argument for the maximum number of characters 
-in the base filename. By contrast, 'nicefilelist' does not provide 
-arguments for \cs{listfiles}, rather column widths for basename, extension, 
-and version number are determined by \emph{templates} using 
-\CtanPkgRef{monofill}{monofill.sty}. As a ``template" for doing this, 
-see the initial settings in Sec.~\ref{sec:templates}. 
+\CtanPkgRef{longnamefilelist}{longnamefilelist.sty} equips
+\cs{listfiles} with an optional argument for the maximum number of characters
+in the base filename. By contrast, 'nicefilelist' does not provide
+arguments for \cs{listfiles}, rather column widths for basename, extension,
+and version number are determined by \emph{templates} using
+\CtanPkgRef{monofill}{monofill.sty}. As a ``template" for doing this,
+see the initial settings in section~\ref{sec:templates}.
 (Such settings must precede the \cs{listfiles command})
-So 'nicefilelist''s \emph{user interface} (at present) does not \emph{extend} 
+So 'nicefilelist''s \emph{user interface} (at present) does not \emph{extend}
 'longnamefilelist''s user interface.
 
-Using 'monofill' is a very different approach than the one of 'longnamefilelist'. 
-'nicefilelist' is more powerful than 'longnamefilelist', but is not based on it 
-in any way. It does not make sense to load both packages, they just overwrite 
-each other's behaviour of \cs{listfiles}. 
+Using 'monofill' is a very different approach than the one of 'longnamefilelist'.
+'nicefilelist' is more powerful than 'longnamefilelist', but is not based on it
+in any way. It does not make sense to load both packages, they just overwrite
+each other's behaviour of \cs{listfiles}.
 
-'longnamefilelist' may become ``obsolete" by the present package, 
-unless one finds that its version of \cs{listfiles} looks fine enough 
+'longnamefilelist' may become ``obsolete" by the present package,
+unless one finds that its version of \cs{listfiles} looks fine enough
 and it is easier to understand and to use than 'nicefilelist'.
 
 \subsection{Installing}
 The file 'nicefilelist.sty' is provided ready, installation only requires
 putting it somewhere where \TeX\ finds it
-(which may need updating the filename data
- base).\urlfoot{ukfaqref}{inst-wlcf} 
+(which may need updating the filename data base).
 
 \subsection{Calling}
 %% restructured for v0.7 2012/10/29:
 Below the `\documentclass' line(s) and above `\begin{document}',
 you load 'nicefilelist.sty' (as usually) by
 \[`\usepackage{nicefilelist}'\]
-or by 
+or by
 \[`\usepackage[<options>]{nicefilelist}'\]
-where <options> may be `r', `wrap', or `r,wrap'~\dots---see 
-summaries in sections~\ref{sec:set} and \ref{sec:opt} 
-on the package options and an example in Section~\ref{sec:short}.
-Alternatively---e.g., for use with \ctanpkgref{myfilist} from the 
-\ctanpkgref{fileinfo} bundle (in a ``\TeX~script"), see Section~\ref{sec:myfilist}, 
-or in order to include the `.cls' file in the list---you may load it by 
+where <options> may be `r', `wrap', or `r,wrap'~\dots---see
+summaries in sections~\ref{sec:set} and \ref{sec:opt}
+on the package options and an example in section~\ref{sec:short}.
+Alternatively---e.g., for use with \ctanpkgref{myfilist} from the
+\ctanpkgref{fileinfo} bundle (in a ``\TeX~script"), see section~\ref{sec:myfilist},
+or in order to include the `.cls' file in the list---you may load it by
 \[`\RequirePackage{nicefilelist}'\]
 or by
 \[`\RequirePackage[<options>]{nicefilelist}'\]
-before `\documentclass' or when you don't use `\documentclass'. 
+before `\documentclass' or when you don't use `\documentclass'.
 
 \subsection{Choosing Settings}                      %% new 2012/10/29
 \label{sec:set}
@@ -104,94 +103,116 @@ before `\documentclass' or when you don't use `\documentclass'.
 
 \AddQuotes                          %% 2012/10/29
 
-The 'nicefilelist' package considers the listing from `\listfiles' 
-a five-column table, the columns being (reserved for) \
-(i)~the base filename, \ (ii)~the filename extension, \ 
-(iii)~the date, \ 
-(iv)~the version (or with option `[r]': the release) number, and \
-(v)~the caption \ of a \LaTeX\ source file. The filename base column 
-is right-adjusted, the other ones are left-adjusted. 
-Date, version, and caption are made up from the <f-info> argument in 
+The 'nicefilelist' package considers the listing from `\listfiles'
+a five-column table, the columns being (reserved for) \\
+(i)~the base filename, \\ (ii)~the filename extension, \\
+(iii)~the date, \\
+(iv)~the version (or with option `[r]': the release) number, and \\
+(v)~the caption \\ of a \LaTeX\ source file. The filename base column
+is right-adjusted, the other ones are left-adjusted.
+Date, version, and caption are made up from the <f-info> argument in
 \[|\Provides<f-type>{<f-base>.<f-ext>}[<f-info>|]\]
 where <f-type> is `Class', `Package', or `File'.
 
-The fixed usual format `YYYY/MM/DD' for the date is assumed; 
-in fact, when <f-info> doesn't start according to this format, 
+The fixed usual format `YYYY/MM/DD'
+or `YYYY-MM-DD' (accepted by \LaTeX\ since 2017-03-08)
+for the date is assumed;
+in fact, when <f-info> doesn't start according to this format,
 it is assumed that no date is given, and some ``missing''
-text will appear in the ``date" column, determined by a macro 
-|\NFLnodate|. The version number 
-(or ``string") must follow in format `v<digit>.<digits>', 
-otherwise some ``missing" text appears in the ``version" column, 
-determined by a macro |\NFLnoversion|. 
-What remains is placed in the ``caption" column. 
-|\NFLnotfound| determines an alternative filling 
-in the case that <f-info> cannot be obtained. 
-See the default settings for these ``failure" texts in 
-Section~\ref{sec:fail}.
-
-The column widths for filename base and extension 
-and the column width for version or release 
-are determined using the \ctanpkgref{monofill} package. 
-They have ``field identifiers" |f-base|, |f-ext|, 
-and |f-version| respectively. The respective widths are 
+text will appear in the ``date" column, determined by a macro
+|\NFLnodate|.
+\pagebreak
+
+Using the filemod package, it is possible to use the date
+of a file which does not explicitly declare a date:
+
+\begin{verbatim}
+\makeatletter
+\RequirePackage{filemod}%
+\renewcommand*\thefilemoddate[3]{#1-#2-#3}
+\renewcommand*{\NFLnodate}{\filemodprintdate{%
+               \filename@area\filename@base.\filename@ext}}
+\makeatother
+\renewcommand*{\NFLnotfound}{%
+               \NFLnodate\NFLspaceII\NFLnoversion\NFLspaceIII}
+\end{verbatim}
+
+The version number
+(or ``string") must follow in format `v<digit>.<digits>',
+otherwise some ``missing" text appears in the ``version" column,
+determined by a macro |\NFLnoversion|.
+What remains is placed in the ``caption" column.
+|\NFLnotfound| determines an alternative filling
+in the case that <f-info> cannot be obtained.
+See the default settings for these ``failure" texts in
+section~\ref{sec:fail}.
+
+The column widths for filename base and extension
+and the column width for version or release
+are determined using the \ctanpkgref{monofill} package.
+They have ``field identifiers" |f-base|, |f-ext|,
+and |f-version| respectively. The respective widths are
 determined by templates <longest> in
 \[|\MDfieldtemplate{<field-id>}{<longest>}|\]
-See Section~\ref{sec:templates} for the default settings. 
+See section~\ref{sec:templates} for the default settings.
 Probably only adjusting the width for \emph{base} filenames
-is required in real life, see the example in Section~\ref{sec:short}.
+is required in real life, see the example in section~\ref{sec:short}.
+(But there exist extensions .info and .mkii and versions
+v4.6.3.1 (fontawesome.sty).)
 
-The spaces between the columns are determined by macros 
-|\NFLspaceI|, |\NFLspaceII|, and |\NFLspaceIII|, 
-see Section~\ref{sec:templates} for the defaults.
+The spaces between the columns are determined by macros
+|\NFLspaceI|, |\NFLspaceII|, and |\NFLspaceIII|,
+see section~\ref{sec:templates} for the defaults.
 
 \DontAddQuotes              %% 2012/10/29
 
 \subsubsection{The Caption Column}
-The width of the caption column (unfortunately) is determined by 
-the stuff enumerated above and the width of the console output window or screen. 
-With long filenames and long captions, the result may look poor. 
-the \emph{characters} that don't fit into the line may continue 
-at left end of the window or screen, disturbing the appearance 
-of a ``table"---unless you use package option |[wrap]|. 
-The latter requires the \ctanpkgref{hardwrap} package by 
-Will Robertson and Kevin Godby 
-(``\Wikienref{not invented here}"). This package tries to determine 
-the screen width by some subtle tests, and until it finds something 
-better, it assumes a width of 80 characters (I suppose). 
-'hardwrap' does \wikienref{Word wrap}{\emph{word wrapping}}, 
-i.e., it doesn't just put \emph{characters} not fitting into the 
+The width of the caption column (unfortunately) is determined by
+the stuff enumerated above and the width of the console output window or screen.
+With long filenames and long captions, the result may look poor.
+the \emph{characters} that don't fit into the line may continue
+at left end of the window or screen, disturbing the appearance
+of a ``table"---unless you use package option |[wrap]|.
+The latter requires the \ctanpkgref{hardwrap} package by
+Will Robertson and Kevin Godby
+(``\Wikienref{not invented here}"). This package tries to determine
+the screen width by some subtle tests, and until it finds something
+better, it assumes a width of 80 characters (I suppose).
+'hardwrap' does \wikienref{Word wrap}{\emph{word wrapping}},
+i.e., it doesn't just put \emph{characters} not fitting into the
 next line, but entire \emph{words}. Moreover, it allows inserting
-some ``newline sequence" before the first word that is too much, 
-and we use this feature here to put the next word into the 
+some ``newline sequence" before the first word that is too much,
+and we use this feature here to put the next word into the
 \emph{caption column} rather than at the beginning of the next line.
-(Details and implementation are in Section~\ref{sec:opt}.)
+(Details and implementation are in section~\ref{sec:opt}.)
+\pagebreak
 
-If you are not happy with the column width that 'hardwrap' 
+If you are not happy with the column width that 'hardwrap'
 chooses, but want to assume your own width <max-line-chars>
-(e.g., your width, measured by your doctor, divided by the 
+(e.g., your width, measured by your doctor, divided by the
  width of one character),
 compute its difference <max-line-chars-minus-one> to 1
-(maybe by your electronic calculator, or an emulation, or 
- a Lua script, cf.~\ctanpkgref{lualatex-doc}, or by 
- \ctanpkgref{bigintcalc}), and enter 
+(maybe by your electronic calculator, or an emulation, or
+ a Lua script, cf.~\ctanpkgref{lualatex-doc}, or by
+ \ctanpkgref{bigintcalc}), and enter
 the 'hardwrap' instruction
-\[|\setmaxprintline{<max-line-chars-minus-one>}|\] 
-when 'hardwrap' or 'nicefilelist' have been loaded 
+\[|\setmaxprintline{<max-line-chars-minus-one>}|\]
+when 'hardwrap' or 'nicefilelist' have been loaded
 \emph{and} before the internal macro `\@dofilelist' is run
-(which happens at the end of the document or when 
+(which happens at the end of the document or when
  \ctanpkgref{myfilist}'s `\ListInfos' is issued, for instance).
 
 \subsection{Usage and Samples with 'myfilist.sty'}
 \label{sec:myfilist}
 \subsubsection{Basically}
-In order to get a reduced and/or rearranged list of file infos 
-with the \ctanpkgref{myfilist} package, 
-`nicefilelist.sty' must be loaded earlier than 
-`myfilist.sty'. This is due to a kind of limitation of the latter, 
- it \emph{issues} `\listfiles' (\TODO). 
-Therefore \cs{listfiles} must be modified earlier---or \emph{issued} earlier, 
+In order to get a reduced and/or rearranged list of file infos
+with the \ctanpkgref{myfilist} package,
+`nicefilelist.sty' must be loaded earlier than
+`myfilist.sty'. This is due to a kind of limitation of the latter,
+ it \emph{issues} `\listfiles' (\TODO).
+Therefore \cs{listfiles} must be modified earlier---or \emph{issued} earlier,
 in this case the \cs{listfiles} in `myfilist.sty' does nothing.
-The file `SrcFILEs.txt' accompanying the---first---distribution of 
+The file `SrcFILEs.txt' accompanying the---first---distribution of
 'nicefilelist' %% corr., was `longname'; `first' etc. 2012/10/29
 was generated by running the following file `srcfiles.tex' with \LaTeX:
 \begin{quotation}\tt\small
@@ -201,7 +222,7 @@ was generated by running the following file `srcfiles.tex' with \LaTeX:
 \cs{ProvidesFile}\{srcfiles.tex\}[2012/03/23
  ~                           file infos -\empty> SrcFILEs.txt]
 \cs{RequirePackage}\{nicefilelist\}
-\%\% INSERT MODIFICATIONS OF INITIAL 
+\%\% INSERT MODIFICATIONS OF INITIAL
 \%\% \verb+`nicefilelist'/`monofill'+ SETTINGS HERE!
 \cs{RequirePackage}\{myfilist\}
 \%\% documentation:
@@ -214,23 +235,23 @@ was generated by running the following file `srcfiles.tex' with \LaTeX:
 \cs{ReadFileInfos}\{srcfiles\}
 \cs{ListInfos}[SrcFILEs.txt]
 \end{quotation}
-Note the lines where to place \strong{custom} modifications of settings 
-for alignment (Section~\ref{sec:templates}) or failure displays 
-(Section~\ref{sec:fail}).
+Note the lines where to place \strong{custom} modifications of settings
+for alignment (section~\ref{sec:templates}) or failure displays
+(section~\ref{sec:fail}).
 
 The previous code mentions the following files:
 \begin{description}
-  \item[`provonly.fd'] has a proper `\ProvidesFile' line without date, 
-                       for seeing what happens in the date and version columns. 
-                       It also was a test for the case that there are fewer 
+  \item[`provonly.fd'] has a proper `\ProvidesFile' line without date,
+                       for seeing what happens in the date and version columns.
+                       It also was a test for the case that there are fewer
                        characters than a date has, and there is no blank space.
   \item[`wrong.prv']   has a `\ProvidesFile' line with wrong file name.
   \item[`empty.f']     just is an empty file.
-  \item[`utopia.xyz']  is not present at all, you get an error when you remove 
+  \item[`utopia.xyz']  is not present at all, you get an error when you remove
                        the comment mark.
 \end{description}
-Moreover, my `.tex' files have dates, but not version numbers, 
-so you see what happens then: 
+Moreover, my `.tex' files have dates, but not version numbers,
+so you see what happens then:
 \vskip\topsep
 \begin{small}\tt
 \obeyspaces\obeylines
@@ -240,7 +261,7 @@ nicefilelist.sty  2012/03/23  v0.1   \rlap{more file list alignment (UL)}
 ~   myfilist.sty  2011/01/30  v0.3a  \rlap{\cs{listfiles} -- mine only (UL)}
 ~   readprov.sty  2010/11/27  v0.3   \rlap{file infos without loading (UL)}
 nicefilelist.tex  2012/03/23   --    \rlap{documenting nicefilelist.sty}
-~   provonly.fd    --  -- --   --    such 
+~   provonly.fd    --  -- --   --    such
 ~      wrong.prv   * NOT FOUND *
 ~      empty.f     * NOT FOUND *
 ~   srcfiles.tex  2012/03/23   --    file infos -> SrcFILEs.txt
@@ -258,7 +279,7 @@ nicefilelist.tex  2012/03/23   --    \rlap{documenting nicefilelist.sty}
 
 In the above example, the 'myfilist' command `\EmptyFileList'
 was missing---it was not intended there. Usually however,   %% is -> was 2012/10/29
-it \emph{is} intended, i.e., the following sequence of 
+it \emph{is} intended, i.e., the following sequence of
 lines is wanted:
 \begin{quotation}\tt\small
 \expandafter\def\expandafter\{\expandafter{\string{}
@@ -269,35 +290,37 @@ lines is wanted:
 \cs{RequirePackage}\{myfilist\}
 \cs{EmptyFileList}[<read-again-files>]
 \end{quotation}
-Here you also see usage of package option |[r]| for 
-release numbers and the adjustment 
+Here you also see usage of package option |[r]| for
+release numbers and the adjustment
    \[|\MFfieldtemplate{f-base}{<longest-name>}|\]
-according to Section~\ref{sec:templates}. 
+according to section~\ref{sec:templates}.
 
-With v0.5, the last three code lines in the snippet above 
-can be replaced by 
+With v0.5, the last three code lines in the snippet above
+can be replaced by
 \[|\MaxBaseEmptyList{<longest-name>}[<read-again-files>]|\]
 ---``optionally" without `[<read-again-files>]'.
-This may save the user from worrying about usage 
-with 'myfilist'. 
+This may save the user from worrying about usage
+with 'myfilist'.
 
 \DontAddQuotes
 
-'nicefilelist' formats file lists nicely 
-even when base filenames have eight characters at most, 
+\pagebreak
+
+'nicefilelist' formats file lists nicely
+even when base filenames have eight characters at most,
 what \LaTeX's original `\listfiles' was made for.
 v0.6 simplifies this case by a star version of `\MaxBaseEmptyList':
 \pagebreak[2]
 \[|\MaxBaseEmptyList*|\]
-works like `\MaxBaseEmptyList{nicefile}' (eight characters)---still, 
-optional `[<read-again-files>]' may follow. This feature is demonstrated 
+works like `\MaxBaseEmptyList{nicefile}' (eight characters)---still,
+optional `[<read-again-files>]' may follow. This feature is demonstrated
 with \ctanpkgref{inputtrc} v/r0.3.
 
 \subsubsection{Sample with Wrapped Caption Column}  %% 2012/10/30
 
 \AddQuotes
 
-The most recent version of the accompanying `SrcFILEs.txt' contains 
+The most recent version of the accompanying `SrcFILEs.txt' contains
 the following:
 \bigskip
 \begingroup \footnotesize
@@ -310,24 +333,24 @@ the following:
 This exemplifies
 \begin{enumerate}
   \item \strong{wrapping} of `provonly.fd''s and \ctanpkgref{kvsetkeys}\file{.sty}
-        file info within the \strong{caption} column 
+        file info within the \strong{caption} column
         using 'nicefilelist''s `[wrap]' option,
-  \item inserted ``\strong{comments}" from \ctanpkgref{myfilist}'s `\FileListRemark', 
-  \item a file `nicefilelist.RLS' for a \strong{release summary}. This is to track 
-        what has happened most recently, whether the most recent release 
-        has been installed (system-wide), or (for me) whether most recent versions 
-        of package and documentation have been released. 
-        When such an `.RLS' file is installed together with packages 
-        in the `tex' subtree of a \acro{TDS}, the release summary can be 
+  \item inserted ``\strong{comments}" from \ctanpkgref{myfilist}'s `\FileListRemark',
+  \item a file `nicefilelist.RLS' for a \strong{release summary}. This is to track
+        what has happened most recently, whether the most recent release
+        has been installed (system-wide), or (for me) whether most recent versions
+        of package and documentation have been released.
+        When such an `.RLS' file is installed together with packages
+        in the `tex' subtree of a \acro{TDS}, the release summary can be
         accessed quickly as a \strong{terminal display}
-        by one of the packages \ctanpkgref{ltxfileinfo}, 
+        by one of the packages \ctanpkgref{ltxfileinfo},
         \ctanpkgref{latexfileversion}, or \ctanpkgref{typeoutfileinfo}.
-        One aim of the `[wrap]' option is allowing longer ``release captions" 
-        (looking fine in the package file list) than fit into a small part 
+        One aim of the `[wrap]' option is allowing longer ``release captions"
+        (looking fine in the package file list) than fit into a small part
         of a single line.
-\end{enumerate} 
+\end{enumerate}
 %
-The above `SrcFILEs.txt' has been generated from the following version 
+The above `SrcFILEs.txt' has been generated from the following version
 of the \TeX\ script `srcfiles.tex':
 \bigskip
 \hrule
@@ -341,48 +364,48 @@ of the \TeX\ script `srcfiles.tex':
 \subsection{Package File Header (Legalese)}
 \input{nicefilelist.doc}
 
-% \pagebreak          %% 2012/09/30 rm. 2012/10/29
+\pagebreak
 \section{Credits}
 \begin{enumerate}   %% 2012/05/20
-  \item It was \ctanpkgauref{muench-hm}{\textsc{Martin M\"unch}} 
-        who pointed out the shortcomings 
+  \item It was \ctanpkgauref{muench-hm}{\textsc{Martin M\"{u}nch}}
+        who pointed out the shortcomings
         of 'longnamefilelist' that the present package addresses---thanks!
   %% 2012/05/20:
-  \item For \textsc{Alois Kabelschacht}---whose idea in 
+  \item For \textsc{Alois Kabelschacht}---whose idea in
         TUGboat~\textbf{8}~\#2\footnote{\tugbartref{tb08-2/tb18kabel}{%
             ``&\expandafter\ vs.\               %% .\ 2012/12/12
-            &\let\ and &\def\ in Conditionals 
+            &\let\ and &\def\ in Conditionals
             and a Generalization of PLAIN's &\loop,"}
-            TUGboat Vol.~8 (1987), No.~2, pp.~184f. 
+            TUGboat Vol.~8 (1987), No.~2, pp.~184f.
             (\urlhttpref{tug.org/TUGboat/tb08-2/tb18kabel.pdf})}
         is used for v0.3---cf.\ the \ctanpkgref{dowith} documentation.
+   %% 2012/05/18:
+   \item Another idea from \textsc{Martin M\"{u}nch}: wrapping inside caption column.
+         Implemented by UL with help of \ctanpkgref{hardwrap} as option |wrap|.
 \end{enumerate}
 
 \section{Missing}
 % \begin{enumerate} %% rm. 2012/10/29
-%   \item 
-        The package once might provide \ctanpkgref{keyval}-style 
-        optional arguments for \cs{listfiles} or even call \cs{listfiles} 
+%   \item
+        The package once might provide \ctanpkgref{keyval}-style
+        optional arguments for \cs{listfiles} or even call \cs{listfiles}
         automatically with 'keyval' package options.
-%   %% 2012/05/18:
-%   \item Another idea from \textsc{Martin Muench}: wrapping inside caption column. 
-%         Can \ctanpkgref{hardwrap} help?
 % \end{enumerate}
-
 \end{document}
 
 VERSION HISTORY
 
 2012/03/20  for v0.1    started
-2012/03/22              trying something 
+2012/03/22              trying something
 2012/03/23  for v0.1a   without "aligning the dots" etc.
-2012/05/18  for v0.30   Legalize -> Legalese; add. TODO "wrapping"; 
+2012/05/18  for v0.30   Legalize -> Legalese; add. TODO "wrapping";
                         ref. to `latexfileinfo-pkgs'
 2012/05/20  for v0.31   mention Kabelschacht
 2012/05/20  for v0.4    on new package option [r]
 2012/09/30  for v0.5    \MaxBaseEmptyList, doc. \pagebreak
 2012/10/11  for v0.6    \MaxBaseEmptyList*, \AddQuotes
-2012/10/29  for v0.7    "M�nch", one item less missing, MDabstract, 
+2012/10/29  for v0.7    "M\"{u}nch", one item less missing, MDabstract,
                         usage restructured and extended
 2012/10/30              \listfiles
 2012/12/12  for v0.7a   vs.\ 
+2022/12/05  for v0.8a   accepts also the new date format
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/source/provonly.fd b/macros/latex/contrib/nicefilelist/source/provonly.fd
new file mode 100644
index 0000000000..357896e8f8
--- /dev/null
+++ b/macros/latex/contrib/nicefilelist/source/provonly.fd
@@ -0,0 +1,4 @@
+%\ProvidesFile{provonly.fd}[2022/12/05 v0.11a such]
+%\ProvidesFile{provonly.fd}[such]
+\ProvidesFile{provonly.fd}[no date, no version, but a lot of info,
+                           look how that is wrapped!]
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/docsrc/srcfiles.tex b/macros/latex/contrib/nicefilelist/source/srcfiles.tex
index 795e982e7d..359d5bd323 100644
--- a/macros/latex/contrib/nicefilelist/docsrc/srcfiles.tex
+++ b/macros/latex/contrib/nicefilelist/source/srcfiles.tex
@@ -1,5 +1,5 @@
 \ProvidesFile{srcfiles.tex}
-             [2012/10/30 file infos -> SrcFILEs.txt]
+             [2022/12/05 file infos -> SrcFILEs.txt]
 \RequirePackage[r,wrap]{nicefilelist}
 \RequirePackage{filedate}
 \MaxBaseEmptyList{nicefilelist}
@@ -31,4 +31,4 @@
 \CheckDateOfPDFmod{nicefilelist.RLS}
 \CheckDateOfPDFmod{srcfiles.tex}
 %\stop
-\NoBottomLines \ListInfos[SrcFILEs.txt]
+\NoBottomLines \ListInfos[SrcFILEs.txt]
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/source/wrong.prv b/macros/latex/contrib/nicefilelist/source/wrong.prv
new file mode 100644
index 0000000000..33aaae4e5e
--- /dev/null
+++ b/macros/latex/contrib/nicefilelist/source/wrong.prv
@@ -0,0 +1 @@
+\ProvidesFile{diffname.prv}[2022/12/05 v0.1 wrong]
\ No newline at end of file
diff --git a/macros/latex/contrib/nicefilelist/nicefilelist.sty b/macros/latex/contrib/nicefilelist/tex/nicefilelist.sty
index 87d66f4886..aa82af7f27 100644
--- a/macros/latex/contrib/nicefilelist/nicefilelist.sty
+++ b/macros/latex/contrib/nicefilelist/tex/nicefilelist.sty
@@ -1,20 +1,20 @@
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{nicefilelist}[2012/12/12 v0.7a
+\ProvidesPackage{nicefilelist}[2022/12/05 v0.8a
                                more file list alignment (UL)]
-%% Copyright (C) 2012 Uwe Lueck,
-%% http://www.contact-ednotes.sty.de.vu
-%% -- author-maintained in the sense of LPPL below --
+%% Copyright (C) 2012 Uwe Lück (deceased June 2020)
 %%
-%% This file can be redistributed and/or modified under
-%% the terms of the LaTeX Project Public License; either
-%% version 1.3c of the License, or any later version.
-%% The latest version of this license is in
-%%     http://www.latex-project.org/lppl.txt
-%% We did our best to help you, but there is NO WARRANTY.
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    https://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%%    https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of
+%% LaTeX version 2005-12-01 or later.
+%% 
 %%
-%% Please report bugs, problems, and suggestions via
 %%
-%%   http://www.contact-ednotes.sty.de.vu
 %%
 %% === Alignment Settings        ===
 %% \label{sec:templates}
@@ -40,6 +40,7 @@
 \MFfieldtemplate{f-ext}{tex}
 \MFfieldtemplate{f-version}{v0.11a}
 %% We are not supporting version numbers greater than 9 at present---sorry! (TODO)
+%% \pagebreak
 %% 
 %% |\NFLspaceI|, |\NFLspaceII|, and |\NFLspaceIII| 
 %% determine the space between the four 
@@ -89,7 +90,7 @@
 %% %% 2012/10/30:
 %% \emph{Without} it expands to `\typeout'
 \newcommand*{\NFL@filerow}{\typeout}
-%% ---`\let' does'nt work with 'myfilist''s redefinition of 
+%% ---`\let' doesn't work with 'myfilist''s redefinition of 
 %% `\typeout'.
 %% \emph{With} `[wrap]', `\NFL@filerow' applies 'hardwrap''s 
 %% `\HardWrap':
@@ -219,9 +220,12 @@
       \else   \expandafter \@secondoftwo \fi}%
 %% Dealing with |\NFL@date@or@rest{<token-list>}| before `\NFL@maybe@three':
   \def\NFL@date@or@rest##1{%
-    \NFL@if@date{##1}{##1}{\NFL@no@date@version##1}}%
-%% |\NFL@if@date{<token-list>}{<yes>}{<no>}| ...
-  \def\NFL@if@date##1{\NFL@slashes##1\NFL@xi xyzxyzxyzx\@nil}% 
+    \NFL@if@dateS{##1}{##1}{%
+      \NFL@if@dateD{##1}{##1}{\NFL@no@date@version##1}%
+      }%
+    }%
+%% |\NFL@if@dateS{<token-list>}{<yes>}{<no>}| ... slashes
+  \def\NFL@if@dateS##1{\NFL@slashes##1\NFL@xi xyzxyzxyzx\@nil}%
 %% |\NFL@slashes| checks that there are slashes at the expected places:
   \def\NFL@slashes##1##2##3##4##5##6##7##8{%
     \NFL@ifx@kbl##5/%
@@ -230,6 +234,17 @@
 %% This especially happens when <token-list> is empty.
 %% Digit candidates back:
     {##1##2##3##4##6##7}}%
+%% Since 2017-03-08 \LaTeX\ accepts dates formatted as
+%% yyyy-mm-dd instead of yyyy/mm/dd.
+%% Currently both formats are valid.
+%% Therefore the nicefilelist package needs to
+%% also accept ``-" (dash) instead of ``/" (slash) as separator.
+  \def\NFL@if@dateD##1{\NFL@dashes##1\NFL@xi xyzxyzxyzx\@nil}%
+  \def\NFL@dashes##1##2##3##4##5##6##7##8{%
+    \NFL@ifx@kbl##5-%
+      {\NFL@ifx@kbl##8-\NFL@ten@only\NFL@false}%
+      \NFL@false
+    {##1##2##3##4##6##7}}%
 %% If the word is a date, we now have taken 6 of the 8 digits. 
 %% \[|\NFL@ten@only{<digits>}<digit><digit>Q|\]
 %% takes the two remaining and then a thing that should be `Q' 
@@ -239,7 +254,7 @@
 %% Finally checking digits:
     ##1##2##3\@nnil}%
 %% |\NFL@digits<token>| is a loop through single tokens:
-  \def\NFL@digits##1{% 
+  \def\NFL@digits##1{%
     \NFL@ifx@kbl##1\@nnil\NFL@true{%
       \NFL@if@digit@code##1<0\NFL@false{%
         \NFL@if@digit@code##1>9\NFL@false\NFL@digits
@@ -267,12 +282,19 @@
 %% if <rest> contains a version id. Otherwise ```<word-1>_<rest>'"
 %% is considered a ``caption" only.
   \def\NFL@maybe@three##1##2{%
-    \NFL@if@date{##1}%
-                {##1\NFLspaceII 
-                 \NFL@space@split{##2}%
-                                 \NFL@maybe@version@rest
-                                 \NFL@version@or@rest}%
-                {\NFL@no@date@version##1 ##2}}%
+    \NFL@if@dateS{##1}%
+                 {##1\NFLspaceII
+                  \NFL@space@split{##2}%
+                                  \NFL@maybe@version@rest
+                                  \NFL@version@or@rest}%
+                 {\NFL@if@dateD{##1}%
+                               {##1\NFLspaceII
+                                \NFL@space@split{##2}%
+                                                \NFL@maybe@version@rest
+                                                \NFL@version@or@rest}%
+                 {\NFL@no@date@version##1 ##2}}}%
+%% \pagebreak
+%%
 %% |\NFL@version@or@rest{<token-list>}|:
   \def\NFL@version@or@rest##1{%
     \NFL@if@version{##1}%
@@ -353,4 +375,9 @@ v0.7   2012/10/13   "updating" date in \Provides...!
                     sec:test below sec:opt, mentioning `url'
        2012/10/30   correcting \NFL@filerow without wrapping, 
                     doc.: |...| in sec:opt
-v0.7a  2012/12/12   doc. monospace -> monofill
+v0.7a  2012/12/12   doc. monospace -> monofill; archived at:
+                    https://web.archive.org/web/20221205210517/
+                     https://mirror.mwt.me/ctan/install/macros/
+                     latex/contrib/nicefilelist.tds.zip
+v0.8a  2022/12/05   Accepting also dashes instead of dashes in date
+                    (one-time fix by H.-Martin Münch)
\ No newline at end of file
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 63c02b8e91..a8e77d25f2 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,15 @@
+2022-12-09  Michal Hoftich  <michal.h21@gmail.com>
+
+	* tex4ht-4ht.tex (tabularray.4ht),
+	* tex4ht-html4.tex (html4.4ht): added support for the Tabularray
+	package.
+	https://puszcza.gnu.org.ua/bugs/?584
+
+2022-12-04  Karl Berry  <karl@freefriends.org>
+
+	* tex4ht-4ht.tex (footnotebackref-hooks.4ht, glossaries.4ht):
+	use standard headers to get the \write-1{version}.
+
 2022-12-02  Michal Hoftich  <michal.h21@gmail.com>
 
 	* tex4ht-4ht.tex (fancyvrb.4ht): use \nobreak to prevent unwanted
diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex
index 2b108f81c1..8bc9a1deb1 100644
--- a/support/TeX4ht/source/mktex4ht-cnf.tex
+++ b/support/TeX4ht/source/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1253 2022-11-28 09:54:31Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1261 2022-12-09 16:06:10Z michal_h21 $
 % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
 % Read by tex4ht-cond4ht.
 %
@@ -51,6 +51,7 @@
 \AddFile{9}{tabu}
 \AddFile{7}{arydshln}
 \AddFile{9}{threeparttable}
+\AddFile{9}{tabularray}
 \AddFile{9}{mdwtab}
 \AddFile{9}{multirow}
 \AddFile{8}{theorem}
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index e0157a2263..ba24967e2f 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1259 2022-12-02 22:40:01Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1262 2022-12-09 16:11:45Z michal_h21 $
 % tex tex4ht-4ht   or   ht tex tex4ht-4ht
 %
 % Copyright 2009-2022 TeX Users Group    
@@ -10962,6 +10962,179 @@ handling. Michal
 >>> \AddFile{9}{threeparttable}
 
 %%%%%%%%%%%%%%%%%%%%%%%%
+\Section{tabularray}
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+\<tabularray.4ht\><<< 
+% tabularray.4ht (|version), generated from |jobname.tex 
+% Copyright 2022 TeX Users Group 
+|<TeX4ht license text|> 
+|<tabularray definitions|>
+|<tabularray table and rows|>
+|<tabularray lines|>
+|<tabularray cell|>
+\Hinput{tabularray} 
+\endinput
+>>> \AddFile{9}{tabularray}
+
+\<tabularray definitions\><<<
+\NewConfigure{tabularray}{8}
+\NewConfigure{tabularrayignoredcell}{2}
+\NewConfigure{tabularrayattributes}[1]{\concat:config\CellAttributes{#1\space}}
+\NewConfigure{tabularraystyles}[1]{\concat:config\CellStyle{#1}}
+\NewConfigure{tabularraycolumnwidth}{1}
+
+\ExplSyntaxOn
+\NewConfigure{tabularrayhalign}[2]{%
+  \cs_set:cpn{tabularray_halign:#1}{#2}
+}
+
+\NewConfigure{tabularrayvalign}[2]{%
+  \cs_set:cpn{tabularray_valign:#1}{#2}
+}
+\ExplSyntaxOff
+>>>
+
+Insert basic tags for table and rows
+
+\<tabularray table and rows\><<<
+\ExplSyntaxOn
+\long\def\:tempa#1#2#3#4{%
+  % insert <table>...</table>
+  \a:tabularray\o:__tblr_environ_code:nnnn:{#1}{#2}{#3}{#4}\b:tabularray
+}
+\HLet\__tblr_environ_code:nnnn\:tempa
+
+\long\def\:tempa#1{\xdef\HRow{\@arabic\c@rownum}\c:tabularray\o:__tblr_build_row:N:{#1}\d:tabularray}
+\HLet\__tblr_build_row:N\:tempa
+\ExplSyntaxOff
+>>>
+
+Tabularray uses hrules in many places, it is not practical to redefine all commands that contain them,
+se we disable underscores that are produced for rules using special.
+
+\<tabularray lines\><<<
+% disable rules
+\ht:special{t4ht@_}
+>>>
+
+We detect borders for each cell using these functions. They can be then set using CSS.
+
+Tabularray supports multiple rules between rows and cells, but these would be too difficult to support
+using CSS, so we don't try that.
+
+\<tabularray lines\><<<
+\ExplSyntaxOn
+% #1 row number, #2 column, #3 hline number (there can be multiple), #4 css property to be set
+\def\:tblr:hlinestyle#1#2#3#4{
+  % get line height
+  \tl_set:Nx \l__tblr_h_tl{ \__tblr_spec_item:ne { hline } { [#1](#3) / @hline-height } }
+  % get dash style
+  \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string
+  \tl_set:Nx \l__tblr_f_tl{\__tblr_spec_item:ne { hline } { [#1][#2](#3) / @dash }}
+  % create CSS only when a dash style is set 
+  \tl_if_empty:NF\l__tblr_f_tl{
+    % get hline color
+    \tl_set:Nx \l__tblr_g_tl { \__tblr_spec_item:ne { hline } { [#1][#2](#3) / fg } }
+    \def\:hlinecolor{\#000000}
+    % convert color to CSS value if color is set
+    \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor}
+    % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here
+    % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here
+    \cs_set:cx{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_h_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
+    \Configure{tabularraystyles}{\csname#4:\endcsname}
+  }
+}
+
+\def\:tblr:vlinestyle#1#2#3#4{
+  \tl_set:Nx \l__tblr_t_tl{ \__tblr_spec_item:ne { vline } { [#2](#3) / @vline-width } }
+  \def\@tblr@dash{} % remove "dash" word from the variable for correct CSS string
+  \tl_set:Nx \l__tblr_f_tl{\__tblr_spec_item:ne { vline } { [#1][#2](#3) / @dash }}
+  \tl_if_empty:NF\l__tblr_f_tl{
+    \tl_set:Nx \l__tblr_g_tl { \__tblr_spec_item:ne { vline } { [#1][#2](#3) / fg } }
+    \def\:hlinecolor{\#000000}
+    % convert color to CSS value if color is set
+    \tl_if_empty:NF\l__tblr_g_tl{\get:xcolorcss{\l__tblr_g_tl}\:hlinecolor}
+    % \Configure{tabularraystyles} doesn't expand attributes, so we need to expand it here
+    % otherwise, we would get wrong color and hline style in the last row, because this macro is called twice here
+    \cs_set:cx{#4:}{#4:\dim_to_decimal_in_unit:nn{\l__tblr_t_tl*2}{1px}px~\l__tblr_f_tl\space~\:hlinecolor;}
+    \Configure{tabularraystyles}{\csname#4:\endcsname}
+  }
+}
+\ExplSyntaxOff
+>>>
+
+The code for cell is a bit complicated. We need to construct CSS properties
+for horizontal and vertical alignment, background color and rules. 
+
+\<tabularray cell\><<<
+\ExplSyntaxOn
+\long\def\:tempa#1#2{%
+% find columns that are covered by rowspan and colspan
+  \xdef\HCol{\@arabic\c@colnum}
+  \xdef\HRow{\@arabic\c@rownum}
+  \xdef\HMultispan{\l__tblr_cell_colspan_tl}
+  \xdef\HRowspan{\l__tblr_cell_rowspan_tl}
+  \let\CellAttributes\@empty
+  \let\CellStyle\@empty
+  % calculate ignored cells, if the current cell uses colspan or rowspan
+  \int_step_inline:nnn{\c@rownum }{\c@rownum - 1 + \l__tblr_cell_rowspan_tl}{
+    \int_step_inline:nnn{\c@colnum }{\c@colnum - 1  + \l__tblr_cell_colspan_tl}{
+      % the loop always matches the current cell, we must ignore it
+      \str_if_eq:eeF{\HCol.\HRow}{####1.##1}{%
+        \cs_gset:cpn{ignoredcell-####1-##1}{}
+      }
+    }
+  }
+  \cs_if_exist_use:c{tabularray_halign:\g__tblr_cell_halign_tl}
+  \cs_if_exist_use:c{tabularray_valign:\g__tblr_cell_valign_tl}
+  % the vertical aligment can be set also in \g__tblr_cell_middle_tl, so we should try it as well
+  \cs_if_exist_use:c{tabularray_valign:\g__tblr_cell_middle_tl}
+  % calculate column width
+  \dim_compare:nNnT {\__tblr_data_item:nen{column}{\HCol}{@col-width}} > {0pt}{
+    \__tblr_get_table_width:% initialize \tablewidth
+    \edef\HColWidth{\fp_eval:n{\__tblr_data_item:nen{column}{\HCol}{@col-width}/\tablewidth*100}\%}
+    % save table width, preferably in CSS
+    \a:tabularraycolumnwidth%
+  }
+  % there can be multiple hlines for each cell, but we only suport the first one, because of limitations of CSS
+  \:tblr:hlinestyle{#1}{#2}{1}{border-top}
+  \int_compare:nNnT{\HRow + \HRowspan - 1} = {\c@rowcount}{% 
+    % draw hline below the last row
+    \:tblr:hlinestyle{\int_eval:n{\c@rownum + 1}}{#2}{1}{border-bottom}
+  }
+  % the same is true for vlines
+  \:tblr:vlinestyle{#1}{#2}{1}{border-left}
+  \int_compare:nNnT{\HCol + \HMultispan - 1} = {\c@colcount}{%
+    % draw hline below the last row
+    \:tblr:vlinestyle{#1}{\int_eval:n{\c@colnum + 1}}{1}{border-right}
+  }
+  % support for the background color
+  \tl_set:Nx \l__tblr_b_tl
+  { \__tblr_data_item:neen { cell } {#1} {#2} { background } }
+  % save background color to the list of CSS, if it is set
+  \tl_if_empty:NF \l__tblr_b_tl{
+    \get:xcolorcss{\l__tblr_b_tl}\:bgcolor
+    \Configure{tabularraystyles}{background-color: \:bgcolor;}
+  }
+  % We can use something like \Configure{tabularrayattributes}{rowspan="\HRowspan"} in \Configure{tabularray}
+  % to declare correct attributes for joined cells
+  \int_compare:nNnT {\HRowspan} > {1}{\g:tabularray}
+  \int_compare:nNnT {\HMultispan} > {1}{\h:tabularray}
+  \cs_if_exist:cTF{ignoredcell-\the\c@colnum-\the\c@rownum}{%
+    \a:tabularrayignoredcell\e:tabularray\o:__tblr_build_cell_content:NN:{#1}{#2}\f:tabularray\b:tabularrayignoredcell
+  }{%
+    \e:tabularray\o:__tblr_build_cell_content:NN:{#1}{#2}\f:tabularray
+  }
+  % the ignored cell is global, so we must undefine it after the thes
+  \cs_undefine:c{ignoredcell-\the\c@colnum-\the\c@rownum}%
+}
+\HLet\__tblr_build_cell_content:NN\:tempa
+
+\ExplSyntaxOff
+>>>
+
+%%%%%%%%%%%%%%%%%%%%%%%%
 \Section{mdwtab}
 %%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -12415,6 +12588,9 @@ We disable the package, but still support the package options, as
 other packages (such as tablefootnote.sty) rely on them.
 
 \<footnotebackref-hooks.4ht\><<<
+% footnotebackref.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
 \:dontusepackage{footnotebackref}
 \RequirePackage{kvoptions}% v3.10
 \@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
@@ -13043,10 +13219,9 @@ The above doesn't work always.  Try
 %%%%%%%%%%%%%%%%%%
 
 \<glossaries.4ht\><<<
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-% glossaries.4ht                        |version %
-% Copyright (C) |CopyYear.2008.       Eitan M. Gurari         %
-|<TeX4ht copyright|>
+% glossaries.4ht (|version), generated from |jobname.tex
+% Copyright |CopyYear.2008. Eitan M. Gurari
+|<TeX4ht copywrite|>
 |<config glossaries|>
 |<index in glossary|>
 \Hinput{glossaries}
diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex
index 0b8669ac5f..0ee6765c00 100644
--- a/support/TeX4ht/source/tex4ht-html4.tex
+++ b/support/TeX4ht/source/tex4ht-html4.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-html4.tex 1258 2022-12-01 16:04:36Z michal_h21 $
+% $Id: tex4ht-html4.tex 1261 2022-12-09 16:06:10Z michal_h21 $
 % Compile 4 times: latex tex4ht-html4
 % Copy html4.4ht into the work directory before all but the last compilation.
 %
@@ -2246,6 +2246,45 @@ We mainly need to handle paragraphs.
 >>>
 %%%%%%%%%%%%%
 
+\subsection{Tabularray}
+
+\<configure html4 tabularray\><<<
+\Configure{tabularray}{
+  \ifvmode\IgnorePar\fi\EndP
+  \gHAdvance\Next:TableNo by 1 \global\let\TableNo=\Next:TableNo%
+  \HCode{<table class="tabularray \@currenvir" id="tbl-\TableNo">}
+}{\ifvmode\IgnorePar\fi\EndP\HCode{</table>}}
+{\HCode{<tr id="row-\TableNo\HRow-">}}{\HCode{</tr>}}
+{\HCode{<td id="cell\TableNo-\HRow-\HCol" style="\CellStyle" \CellAttributes>}}{\HCode{</td>}}
+{\Configure{tabularrayattributes}{rowspan="\HRowspan"}}
+{\Configure{tabularrayattributes}{colspan="\HMultispan"}}{}
+
+% cells hidden by cell and row spans. they shouldn't be included in HTML, so we hide them using comments
+\Configure{tabularrayignoredcell}{\HCode{<!-- ignored cell: }}{\HCode{ -->}}
+
+% this is a default alignment, so we can ignore it, to save some space in the generated files
+% \Configure{tabularrayhalign}{l}{\Configure{tabularraystyles}{text-align:left;}}
+\Configure{tabularrayhalign}{r}{\Configure{tabularraystyles}{text-align:right;}}
+\Configure{tabularrayhalign}{c}{\Configure{tabularraystyles}{text-align:center;}}
+\Configure{tabularrayhalign}{j}{\Configure{tabularraystyles}{text-align:justify;}}
+
+% this is a default alignment, so we can ignore it, to save some space in the generated files
+% \Configure{tabularrayvalign}{m}{\Configure{tabularraystyles}{vertical-align:middle;}}
+\Configure{tabularrayvalign}{h}{\Configure{tabularraystyles}{vertical-align:top;}}
+\Configure{tabularrayvalign}{p}{\Configure{tabularraystyles}{vertical-align:top;}}
+\Configure{tabularrayvalign}{f}{\Configure{tabularraystyles}{vertical-align:bottom;}}
+% the vertical alignment of the following two is not correct, but CSS doesn't support the correct one
+\Configure{tabularrayvalign}{t}{\Configure{tabularraystyles}{vertical-align:top;}}
+\Configure{tabularrayvalign}{b}{\Configure{tabularraystyles}{vertical-align:bottom;}}
+
+% Save column width only on the first row
+\Configure{tabularraycolumnwidth}{\ifnum\HRow=1\Css{\#tbl-\TableNo\space td:nth-child(\HCol){width:\HColWidth;}}\fi}
+\Css{table.tabularray{table-layout: fixed;border-collapse:collapse;margin:0.3em 0;}}
+>>>
+
+
+
+
 %%%%%%%%%%%%%
 \subsection{Mdwtab}
 %%%%%%%%%%%%%
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 008f864836..1f6663c7ac 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -84,6 +84,7 @@ $mirrors = {
       'https://ctan.gutenberg-asso.fr/' => 1,
       'https://ctan.mines-albi.fr/' => 1,
       'https://ctan.tetaneutral.net/' => 1,
+      'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
       'https://mirror.ibcp.fr/pub/CTAN/' => 1,
       'https://mirrors.ircam.fr/pub/CTAN/' => 1,
       'https://texlive.mycozy.space/' => 1,
@@ -106,6 +107,7 @@ $mirrors = {
       'https://ftp.tu-chemnitz.de/pub/tex/' => 1,
       'https://mirror.clientvps.com/CTAN/' => 1,
       'https://mirror.dogado.de/tex-archive/' => 1,
+      'https://mirror.informatik.hs-fulda.de/tex-archive/' => 1,
       'https://mirror.physik.tu-berlin.de/pub/CTAN/' => 1,
       'https://packages.oth-regensburg.de/ctan/' => 1,
     },
@@ -173,9 +175,6 @@ $mirrors = {
       'https://mirror.its.dal.ca/ctan/' => 1,
       'https://muug.ca/mirror/ctan/' => 1,
     },
-    'Costa Rica' => {
-      'https://mirrors.ucr.ac.cr/CTAN/' => 1,
-    },
     'USA' => {
       'http://bay.uchicago.edu/CTAN/' => 1,
       'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index db7c1896ea..975f057fac 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2022
-depend revision/65225
+depend revision/65231
 
 name 00texlive.image
 category TLCore
@@ -4673,7 +4673,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 65225
+revision 65227
 shortdesc TeX Live standalone installer package
 longdesc This package defines the files to go into the installer
 longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -192529,7 +192529,7 @@ catalogue-version 2.0.2
 
 name lt3rawobjects
 category Package
-revision 65121
+revision 65230
 shortdesc Objects and proxies in LaTeX3
 relocated 1
 longdesc This package introduces a new mechanism to create objects like
@@ -192537,19 +192537,19 @@ longdesc the well known C structures. The functions exported by this
 longdesc package are quite low level, and many important mechanisms like
 longdesc member protection and name resolution aren't already defined
 longdesc and should be introduced by intermediate packages.
-containersize 3528
-containerchecksum 4f37e55ebaa90557fb6a78690181b21edcc86f385c80eb4e9c6efe9fc4c9f20043087a72bda562c0960b31b988fd5e20dec6339422264197b29dfac1d3f20c57
-doccontainersize 535776
-doccontainerchecksum b8e931a733ceac244940bffab8b0deac3238da4c69347d9ca19c28c72b1e4729e532b5411dd3a89d9c3c5c4d119d4adb0ae672fa6e6d2602cb827058ec8a340b
-docfiles size=133
+containersize 3724
+containerchecksum 633da20bc0242a755041721c3e1672160cf41d924ff33ddb511debeb5c1961c0a83a07d2c7571305a7aeab4f623ff2047c8d0587a2f1b94ee2c7820d2c3116c9
+doccontainersize 536804
+doccontainerchecksum f84e47dae753654366955666f855087ed43d2efbf9b159dadb581c84eadac1f21422c593bf1fb428f47f176fc248c0e75f86d72c998253a7ffd14713536115dd
+docfiles size=172
  RELOC/doc/latex/lt3rawobjects/README.md details="Readme"
  RELOC/doc/latex/lt3rawobjects/lt3rawobjects.pdf details="Package documentation"
-srccontainersize 10044
-srccontainerchecksum 2995a4b1a7368631562c3ca9295b660573c7ade7e652f4ce708841130908645b2861cc3c28698c0a8a9be9b63d4645989d375565b870b0ecd20e577ba73ee712
-srcfiles size=14
+srccontainersize 11808
+srccontainerchecksum 1412f86829fa26064343fb4c8ece1b29033c16db564621f2fef854077b00dd590873ffeeb002f419dfee7a815de8b63a39c256a2f9822b80b1f013dc29454ced
+srcfiles size=17
  RELOC/source/latex/lt3rawobjects/lt3rawobjects.dtx
  RELOC/source/latex/lt3rawobjects/lt3rawobjects.ins
-runfiles size=5
+runfiles size=6
  RELOC/tex/latex/lt3rawobjects/lt3rawobjects.sty
 catalogue-contact-announce https://github.com/Loara/lt3rawobjects/releases
 catalogue-contact-bugs https://github.com/Loara/lt3rawobjects/issues
@@ -192560,7 +192560,7 @@ catalogue-contact-support https://github.com/Loara/lt3rawobjects/discussions
 catalogue-ctan /macros/latex/contrib/lt3rawobjects
 catalogue-license gpl3+
 catalogue-topics macro-supp expl3
-catalogue-version 2.1.1
+catalogue-version 2.2
 
 name ltablex
 category Package
@@ -282704,7 +282704,7 @@ catalogue-version 1.6a
 
 name simpleicons
 category Package
-revision 65167
+revision 65229
 shortdesc Simple Icons for LaTeX
 relocated 1
 longdesc Similar to FontAwesome icons being provided on LaTeX by the
@@ -282712,11 +282712,11 @@ longdesc fontawesome package, this package aims to do the same with
 longdesc Simple Icons. For reference, visit their website:
 longdesc https://simpleicons.org/.
 execute addMap simpleicons.map
-containersize 2707528
-containerchecksum dc290ce6a254cfb3b963b2dab3dafa368d476b1648119f7e1f803069674fd1d82ead26763f3b5c82ef3e2ecb67f4ef876c040670049b6f109c26516956488455
-doccontainersize 1986672
-doccontainerchecksum cfdda03b85b8f237ca79e1b82d883b9c0baabf65b40752271ceefd6dfb4dd3c50eeb52af7de14e5c84950c1811e91ed023ddb7ebab9676fa2b1c14d75c726375
-docfiles size=517
+containersize 2709564
+containerchecksum cae53d2bb2ac89637ca841dcd51b4194636e03b6c572302ec06be3949bc7b1b89a17246ac58a74f9d4082bce4e2219016775968305f55446875227383831d7c1
+doccontainersize 1988208
+doccontainerchecksum 58639e95d6952f2177a6c0f74267224de9ba7f269fb556fe1453696ccb609cf78bbdba726be7c4d7db30dab56fa08a44eb699dd169eb16b0c9f8352cbe06932d
+docfiles size=518
  RELOC/doc/fonts/simpleicons/README.md details="Readme"
  RELOC/doc/fonts/simpleicons/bindings.tex
  RELOC/doc/fonts/simpleicons/simpleicons.pdf details="Package documentation"
@@ -282763,7 +282763,7 @@ catalogue-contact-repository https://github.com/ineshbose/simple-icons-latex
 catalogue-ctan /fonts/simpleicons
 catalogue-license cc-by-1
 catalogue-topics font font-symbol font-supp-symbol font-otf font-type1
-catalogue-version 7.21.0
+catalogue-version 8.0.0
 
 name simpleinvoice
 category Package
@@ -300096,7 +300096,7 @@ binfiles arch=x86_64-solaris size=1
 
 name tex4ht
 category Package
-revision 65171
+revision 65231
 shortdesc Convert (La)TeX to HTML/XML
 longdesc A converter from TeX and LaTeX to SGML-based formats such as
 longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -300117,10 +300117,10 @@ longdesc files from them is nontrivial, and generally done with the
 longdesc Makefile in development, from which the TeX4ht package in TeX
 longdesc Live is updated.
 depend tex4ht.ARCH
-containersize 974364
-containerchecksum 28c5f7aad288a38241a4099d25bc779c9b984779246f9c7d5bec4d4b389f04cffa04848a5052b3c56eb0503cc18d2962b3b012f868ea9b24eb6f0872348d01d2
+containersize 976252
+containerchecksum d5631741b6c798047c0ced684df0ce2d1ec592ac43143fe3ff1f3bd24b9b792dca88512278b74d6c4ecdad4634bbf803ed7b010c5e2682dced06e8a7591ccfeb
 doccontainersize 136384
-doccontainerchecksum 5c5cf5a944e60140abe0c85cc18caa74043c25afca308191925212d1417cfa8b27d2e44ec184eb66a0d684ee95ec303e713630601a48a5d16c9aa490cd20cf11
+doccontainerchecksum 87ccdf03df6b43e24f720b7e12d592fb0886bf28ae89ea0ae0def4efc04c1e04f2b822be3b9e2c9c2e05ce9caa6cb5c3f28d42b7854a40007f187658b86c03df
 docfiles size=260
  texmf-dist/doc/generic/tex4ht/Makefile
  texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -300192,9 +300192,9 @@ docfiles size=260
  texmf-dist/doc/generic/tex4ht/mn56.html
  texmf-dist/doc/generic/tex4ht/mn5x.png
  texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1285060
-srccontainerchecksum 1c87cca6ccddb10abe2479ad0d3e71cc6d120ccea3aaad5f75822b965fbe9aa1c93691e0f4a075022c7d55148767e6619883e46c0b461e904400cfc54664807b
-srcfiles size=3941
+srccontainersize 1288856
+srccontainerchecksum 46ed4c66a3b5d0c3a493656b05e9dbf082db3fa4eb9745c27f70c16ea7d360b581d12f9060d45d54966438a8bb7569dd71b9c0f018c790963ab9d74999c987aa
+srcfiles size=3943
  texmf-dist/source/generic/tex4ht/ChangeLog
  texmf-dist/source/generic/tex4ht/Makefile
  texmf-dist/source/generic/tex4ht/README
@@ -300271,7 +300271,7 @@ srcfiles size=3941
  texmf-dist/source/generic/tex4ht/update-htfonts
  texmf-dist/source/generic/tex4ht/wripro.tex
  texmf-dist/source/generic/tex4ht/xtpipes.tex
-runfiles size=11360
+runfiles size=11362
  texmf-dist/scripts/tex4ht/ht.sh
  texmf-dist/scripts/tex4ht/htcontext.sh
  texmf-dist/scripts/tex4ht/htcopy.pl
@@ -300695,6 +300695,7 @@ runfiles size=11360
  texmf-dist/tex/generic/tex4ht/t2benc.4ht
  texmf-dist/tex/generic/tex4ht/tablefootnote.4ht
  texmf-dist/tex/generic/tex4ht/tabu.4ht
+ texmf-dist/tex/generic/tex4ht/tabularray.4ht
  texmf-dist/tex/generic/tex4ht/tabularx.4ht
  texmf-dist/tex/generic/tex4ht/tabulary-a.4ht
  texmf-dist/tex/generic/tex4ht/tabulary.4ht
@@ -310974,7 +310975,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 65225
+revision 65227
 shortdesc TeX Live infrastructure programs
 longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
 longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -310982,10 +310983,10 @@ depend texlive-scripts.ARCH
 depend texlive.infra
 execute addMap mathpple.map
 postaction shortcut type=menu name="TeX Live command-line"   cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 113628
-containerchecksum db447b588229ce45c06e4840f1ce52b124eb10eda6de1d4985bf77077d542df3442faff1bd72aaef31b61bd9225dcf56803557858ecff53dc2a1f779850abca9
-doccontainersize 423420
-doccontainerchecksum 4d4a4106016118f1a56a46926ff2bf57ee828ee205ea8f54250913c6159f36227fc369ed1bb3792ed7f326a4f162a96b8337ea39710d126ab14f89efcc73fd0a
+containersize 113652
+containerchecksum f72d567d17178b3bb3c66b054838675b1a81fbd9fbe873516bd7f0829bc2db330a5470d5b5d7e27247582a92b5102fe99aea138753966ce2ce4dd533e9bbe0dd
+doccontainersize 423416
+doccontainerchecksum b8ebcb7cedafd7a850012287dc693170e35791a8aae0bbafce46c5acd8b02bc677c7ba759df7344ea0d58b8c5ff0cbea4ae3dab14cd77bbc95a2465e6122578e
 docfiles size=532
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 645e291cef..e01d76b079 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-fd2a472682877d79c90f58164a1b169f  texlive.tlpdb
+0cdb45c05bc53da48d2cb9928e1ef30c  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 40b804ef9b..a25c62e21f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-963d3311e84bc1566c7310268fb1a4444e5ae243644f8d994029cdf074d566d992f88387dcd2436fba267182eecdcf2e111e724195ce5dde494b55c0c418f1d8  texlive.tlpdb
+e36504995b8504b561b56645020c6c787eccaee73f8640c253c63cbe639820b216f606e4816fc9699cce9d2225b06adec39b02ea089dd39085fbbb75d7991994  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index dfee904791..d736ce98ec 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCgAGBQJjkod/AAoJEEzhh34ZQ4xwrL0H/1T4Ihe2nn7WmprgKSuKiF1P
-tW6RRFOjsvXG+RDt2+8Wjir4NnB7e6uL3Il7NpZsxBE2/5U1cfpbBfq4hxQOb071
-0Qxs7eBViNjs+CbQ1CgXDhWVwaTjUBLfIMom9pg67zLcrK2Fy5lIoaoD7ufVRW0r
-5puxAvgIaM76rlkltWN3a35pclEs7RbKmtxvpERdAJqj+NpWzAff4A1v2VCjcbgD
-uDpHWRdoXsa2UQI2kc/9muvMshuZZiiMuIZQhP9UMKGDgD8mO0ejzKD87uniuHIR
-hK9USQ9o5kSgEI8HT2/WJvTmsG7EXZShjbnqlZYEx2rJVtu3h5hIK9a24AAChBA=
-=n451
+iQEcBAEBCgAGBQJjk9ipAAoJEEzhh34ZQ4xwbTMIAIrbYZVIe4z3nUvUie9CL6Jf
+qlyMPGwN2SCmVTCDEcQ8sD12PpJ0R7JJEsqE/hUUglVspTcwrZlgXA3ZNz9iraDf
+W/29E7qzMgOIoAFnZv/5bhnAi+vN4hkwIy8tF3fHSakefvrt+E31oLr1md+nyVo5
+tLzCj3txvAi4CiSdLXGtFvPLcVbdAP3X7gN3fe+vbSfV008ClSWQxMCdFqVw7R5n
+6wNfdZOOLR7Ya6f8CDtmhVO9o7xoQeUY0c+X55gOFcHtJL9TrVS9OBeXO2w5q5QY
+25m3eOYJGl0R2srmYrCFL3w9CjqVyCUct/6/585uWGVrgakZk+Ox7ftkWvSCjcY=
+=jjB6
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 1553672554..1c6ce50007 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index 4dd8c601d2..5e4eaa451a 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 316ae7ae28..5048228237 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
 
 [repository]
-date=1670582944
+date=1670695484
 lastupd=miktex-zzip-bin-x64-2.9 miktex-zlib-bin-x64-2.9 miktex-yap-bin-x64-2.9 miktex-xml2pmx-bin-x64 miktex-xetex-bin-x64-2.9 miktex-web-bin-x64-2.9 miktex-uriparser-bin-x64-2.9 miktex-upmendex-bin-x64 miktex-ttf2pk2-bin-x64-2.9 miktex-texworks-bin-x64-2.9 miktex-texware-bin-x64-2.9 miktex-texify-bin-x64-2.9 miktex-tex4ht-bin-x64-2.9 miktex-tex2xindy-bin-x64-2.9 miktex-tex-bin-x64-2.9 miktex-teckit-bin-x64-2.9 miktex-tdsutil-bin-x64 miktex-synctex-bin-x64-2.9 miktex-runtime-bin-x64-2.9 miktex-ptex-bin-x64
-lstdigest=c842a97ff956f7f2359ebfa7637ab034
+lstdigest=3b3a05fb77e27df948569cd45c1e8d2a
 numpkg=6241
 relstate=next
-version=8378
+version=8379
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: ODTDs/x2tFocpZGry3Nv8SWpdA2lCpiHKoIRViO2ZWI/PkY/RjNGFL1sqfF2FCSl+6AtwXoHjjbbm07VdxjDfLf/JW9LLMyRF+vbWpd84fP3kSvhxf0n2zBd/bWPs4F0hjfdtDA5VizELZoJ08vJir+yQ27uyei7yNcCLAeLq/4F+WUcfZaM6K6QsdlzHoc+AJrKIVtIBJYKF+V6+Am1k9/O+1gWyrX0/kQlYUQp5qh6EZCbbCbifQPVmNZf3hZHWx+aj1Vr54ikB8ci3RdJrgt7ahw01DmvSHEvN5UDeVY3P8JeEmeYjVU3qioRBzEOiST5sEq6E8B+x8/LkoHoQA==
+;;;; signature/miktex: tdUxuo4o9PZQWgZO/NIrXIY4Aowku1jCrr/8OXPKRcXNmhBWWRgXyHdDMM8zo3HyakBFa8RyKHH0IYj7mspoP91YZuP0dPvqzotA2MBJKvR3c55FbemdzLZRyeDQIzy6Jwvdq23//V16prQZblADvh83+aIQw5Q+uzvBR/9Sm9oQMNW7sf+YzwgPGytDc8yR+4l5ULv1LqJut9ArVqy9Npre0MCNg3o22fgQxwo6g1/1ZNV2bwAriYRfUJH952TORZowyeNkQ/odbgQ6BIZA4hOikK6Y8vmOGYPskQsP/Z10jTCDHOD46XXpCY+B9JCrqljga3tOlGa441GY5BwVMg==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index bc8fa1d759..d816585b76 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 
 [repository]
-date=1670582906
-lastupd=cjk__source cjk pixelart__source pixelart digestif__source digestif__doc digestif miktex-misc jourcl__source jourcl__doc jourcl hfutexam__source hfutexam__doc hfutexam dtxdescribe__source dtxdescribe__doc dtxdescribe cjk-fonts xduts__source xduts__doc
-lstdigest=59d193731efc5ce66559b5bb885f19fb
+date=1670695436
+lastupd=simpleicons__source simpleicons__doc simpleicons lt3rawobjects__source lt3rawobjects__doc lt3rawobjects cjk__source cjk pixelart__source pixelart digestif__source digestif__doc digestif miktex-misc jourcl__source jourcl__doc jourcl hfutexam__source hfutexam__doc hfutexam
+lstdigest=7e9e5eea23668812684c2fed7b786513
 numpkg=6241
 relstate=stable
-version=8378
+version=8379
 
 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
 ;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: FtOgFCFxOw0WDi8Q3HZKMSGgEt6NIQu3ff6lQBuYUwXDxdIfPA+GR8WccWv1stxs0gXdyIVjF66LwrC5E2D3IQTQ7wd7ukwC46j6K+uTJx09xEC4uZAR5CicnCaii8S/dn5riUmIwihUWpz8CRH3dTPbZI3u0n6BeNvdIFA7MtNOhGzkQoZV/JEz+XRQxzzUhg54bQ7zjZQAFK9IcZG4Q8ci3cD6ri7yAn+t+TZWGCLgrbrwp+PlPPEMKWPEXcdWr9JfMD+gxmdPYYqeeB9s7LoJpemp9q+mS35SW5m6eBpe/sf5ud95MfGosJpOaekJng28yK3Xhs2gW+pWuK3IRA==
+;;;; signature/miktex: gGx1hX9/ViSCjWtb30hOp+CUbuXY7xTZhrow363X2spBfh0JwbhC6L8O/hGjMv8ZBkYuxP9t1mDFP0+FFdJBDPEPvQowvvfkncx6WVjYSh3bPUIe9VgkTXx4MCOv+rFbj/bl5UJ4dcyhT5kCNn6Flvc7rZMQ+t6O3RUqCB1VggHAEnYF8JRkF2JtcxIDqLkwK3Iuh9XvVkUmoAyCplraRyP+JF3Uxtc8l9bi3sLBcxUQ+UWrIime6dEedHNeS6sCPowaADdzBpwjNN2ucIYPNVYczCa/SMRWGfsRcHo/Kjgq8MXMAwF9ryPfeweu6TOp/DkicBD6/XAoCVJwLyeqWw==
 ;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 90bf035177..adab09acb4 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
 #   The source CTAN of this site's material:
 dante.ctan.org
 #   The year-month-day-hour-minute of this site's material:
-2022-12-10-02-02
+2022-12-11-02-02