From f4a90900ae6ff36c39e840d41d64b1ef9e1aaaf4 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sun, 3 Sep 2023 11:01:43 -0600
Subject: [PATCH 01/17] TIC attachment doc updates

---
 docs/_docs/filebase/tic-support.md | 58 ++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/docs/_docs/filebase/tic-support.md b/docs/_docs/filebase/tic-support.md
index e1d01ffba..9639b5b74 100644
--- a/docs/_docs/filebase/tic-support.md
+++ b/docs/_docs/filebase/tic-support.md
@@ -3,7 +3,7 @@ layout: page
 title: TIC Support
 ---
 ## TIC Support
-ENiGMA½ supports FidoNet-Style TIC file attachments by mapping TIC areas to local file areas.
+ENiGMA½ supports FidoNet-Style TIC file attachments by mapping external TIC area tags to local file areas.
 
 Under a given node defined in the `ftn_bso` config section in `config.hjson` (see
 [BSO Import/Export](../messageareas/bso-import-export.md)), TIC configuration may be supplied:
@@ -17,9 +17,9 @@ Under a given node defined in the `ftn_bso` config section in `config.hjson` (se
           packetPassword: mypass
           encoding: cp437
           archiveType: zip
-          tic: {
+          tic: { // <--- General TIC config for 46:*
             password: TESTY-TEST
-            uploadBy: Agoranet TIC
+            uploadBy: AgoraNet TIC
             allowReplace: true
           }
         }
@@ -29,7 +29,15 @@ Under a given node defined in the `ftn_bso` config section in `config.hjson` (se
 }
 ```
 
-You then need to configure the mapping between TIC areas you want to carry, and the file base area and storage tag for them to be tossed to. Optionally you can also add hashtags to the tossed files to assist users in searching for files:
+Valid `tic` members:
+
+| Item | Required | Description |
+|--------|---------------|------------------|
+| `password` | :-1: | TIC packet password, if required |
+| `uploadedBy` | :-1: | Sets the "uploaded by" field for TIC attachments, for example "AgoraNet TIC" |
+| `allowReplace` | :-1: | Set to `true` to allow TIC attachments to replace each other. This is especially handy for things like weekly node list attachments |
+
+Next, we need to configure the mapping between TIC areas you want to carry, and the file base area (and, optionally, specific storage tag) for them to be tossed to. You can also add hashtags to the tossed files to assist users in searching for files:
 
 ```hjson
 ticAreas: {
@@ -41,10 +49,22 @@ ticAreas: {
 }
 
 ```
-Multiple TIC areas can be mapped to a single file base area.
+
+> :information_source: Note that in the example above `agn_node` represents the **external** network area tag, usually represented in all caps. In this case, `AGN_NODE`.
+
+Valid `ticAreas` members under a given node mapping are as follows:
+
+| Item | Required | Description |
+|--------|---------------|------------------|
+| `areaTag` | :+1: | Specifies the local areaTag in which to place TIC attachments |
+| `storageTag` | :-1: | Optionally, set a specific storageTag. If not set, the default for this area will be used. |
+| `hashTags` | :-1: | One or more optional hash tags to assign TIC attachments in this area. |
+
+
+💡 Multiple TIC areas can be mapped to a single file base area.
 
 ### Example Configuration
-An example configuration linking file base areas, FTN BSO node configuration and TIC area configuration.
+Example configuration fragments mapping file base areas, FTN BSO node configuration and TIC area configuration.
 
 ```hjson
 fileBase: {
@@ -79,22 +99,24 @@ scannerTossers: {
                 }
             }
         }
+
+        ticAreas: {
+            // here we map AgoraNet AGN_NODE -> local msgNetworks file area
+            agn_node: {
+                areaTag: msgNetworks
+                storageTag: msg_network
+                hashTags: agoranet,nodelist
+            }
+            agn_info: {
+                areaTag: msgNetworks
+                storageTag: msg_network
+                hashTags: agoranet,infopack
+            }
+        }
     }
 }
 
 
-ticAreas: {
-    agn_node: {
-        areaTag: msgNetworks
-        storageTag: msg_network
-        hashTags: agoranet,nodelist
-    }
-    agn_info: {
-        areaTag: msgNetworks
-        storageTag: msg_network
-        hashTags: agoranet,infopack
-    }
-}
 ```
 
 ## See Also

From e87e7ad2775b2df4139e232eb6ed5597cdb251c7 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Sun, 3 Sep 2023 21:35:50 -0500
Subject: [PATCH 02/17] Updated Docker action

---
 .github/workflows/docker.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 43e0e6cf5..165fc5226 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -11,23 +11,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           tags: enigmabbs/enigma-bbs:latest
           file: docker/Dockerfile

From 3adbb517e8ec8fba6691d0b45a9a6510b6405f90 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Tue, 5 Sep 2023 14:55:57 -0500
Subject: [PATCH 03/17] Updated art lengths to be 24 lines

---
 .../luciano_blocktronics/2FACONFSCR.ans       | Bin 2672 -> 3638 bytes
 art/themes/luciano_blocktronics/BBSADD.ANS    | Bin 2112 -> 2980 bytes
 art/themes/luciano_blocktronics/BBSLIST.ANS   | Bin 2392 -> 3734 bytes
 art/themes/luciano_blocktronics/FBLISTEXP.ANS | Bin 309 -> 307 bytes
 art/themes/luciano_blocktronics/FDLMGR.ANS    | Bin 2337 -> 3398 bytes
 art/themes/luciano_blocktronics/FWDLMGR.ANS   | Bin 2410 -> 3532 bytes
 art/themes/luciano_blocktronics/MSGLIST.ANS   | Bin 2264 -> 3425 bytes
 art/themes/luciano_blocktronics/MSRCHLST.ANS  | Bin 2219 -> 3328 bytes
 art/themes/luciano_blocktronics/MYMSGLST.ANS  | Bin 2122 -> 3267 bytes
 art/themes/luciano_blocktronics/NEWMSGS.ANS   | Bin 2340 -> 3480 bytes
 art/themes/luciano_blocktronics/ONELINER.ANS  | Bin 1817 -> 3061 bytes
 .../luciano_blocktronics/PRVMSGLIST.ANS       | Bin 2280 -> 3429 bytes
 art/themes/luciano_blocktronics/STATUS.ANS    | Bin 5083 -> 5083 bytes
 art/themes/luciano_blocktronics/SYSSTAT.ANS   | Bin 3066 -> 3490 bytes
 art/themes/luciano_blocktronics/ULDETAIL.ANS  | Bin 1941 -> 3339 bytes
 art/themes/luciano_blocktronics/USERLST.ANS   | Bin 2047 -> 3164 bytes
 art/themes/luciano_blocktronics/WHOSON.ANS    | Bin 1162 -> 2363 bytes
 art/themes/luciano_blocktronics/theme.hjson   |  10 +++++-----
 art/themes/luciano_blocktronics/wfc.ans       | Bin 3138 -> 3130 bytes
 art/themes/luciano_blocktronics/wfchelp.ans   | Bin 606 -> 592 bytes
 .../wfckicknodeprompt.ans                     | Bin 65 -> 193 bytes
 21 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/art/themes/luciano_blocktronics/2FACONFSCR.ans b/art/themes/luciano_blocktronics/2FACONFSCR.ans
index 3c2560007a954e0fedf9f1c121b4844f005e5026..114c25ab125f75188b76d15afdd02c474d5f3a38 100644
GIT binary patch
literal 3638
zcmcInO;6iE5QQEq^<I_BUV5x*90V$y0!>>EA&8iA;1p6*RmI^e(7%QF9sLKf>VH!8
zy_wndI)tE7x=68i=j+Xz$!u6UOp2w$R#Ld7!{wr!)T=71atTsbFQ{xl6_Q#FZxvOY
z<EK7dZD=MU5+e~kw_`V%Ooga}J?hQ;s@o`vLwc>W_|3;^vET3Px$K}PiNBGf5ACh2
zx98gX*{9A<w!PKPwtG9&PKvjp;CefqNI%=|#@pR?zkkr%dv9SvQi3NfI{hsiZ6Guh
zgv0fE4_w2+XqcZgNr})0caP!(Mg}8mZ)!@-=*8)E?qfSENfezy4Q+ZnFh!6e`J9f=
z+~s&MzPb#VQMq`Xb(ckT)m|HoWQd^F&6bk~(zA$DHD#v-TtsnvGPpjyK#A70WzB3|
z;q<$yha<03aOi8^x(~wx(C4|FA-gBa(+2T%GCmCkLKo-K-{gy(di^c`;V#jcqruTh
z?#?gV@bnA%#Pb{Q)AZ=B>Cs^L{pw7NF7H}3Q;k4SSEf-7LV7G8UgYDuemn|-7&T14
z=A-;#FwWfwdCUf5Aau@!j<5a?-_ud*8R>KQx2I2r=tC}(`B6%Y-{p;!wW5UHN>a?%
zo`KH?6~j8}+^McMj0&dFO}ramfbe2QFC3HTg4wr&#Vol136}67O`B>e+Tm*(@W=>y
zDxt8&p%}rvcxcc?J{psuj)nVe!g~)Pse{e0DvUAQn^if%9xkUm%pgti8QX!ha=Py<
zHly-(mFRfl4>Q`r@%gs_BSby~hAI3@auotZ9!&#>%nlmJQp(k!DRL>V-b&lTq^Q6u
zImcGyDK;RCQj{f?YOg@UY6K7*L)hZNL=9<6MdghmUIA=y$_sU?CKLK(B~%j9!NL74
zF53KYL-kM<0e1%oV5|WzmI5L!9>`AGf?Ja@#~I0(i5O|t-lX#C@SwSiL{Lx`&J2K9
zhkB@7$dR508OnU1f$aEYS?f0~%Gv<O2qa%oB>5(ha(UozimXr=%}w5w1^yxol&BH~
zFbrP##k3<lm<}G|OA<%l#hI(hJX)<9f{A?;ceT%6grIXq**yW3E~2S<H-HB5_SU1R
zn}8xMn70eG7%(Hr_<;vyQPnhktN3(m<-_}pITQ)L%VvQI3-{^^6yP^mORO*&{Z7ZB
zlH><&)CM67)Gu88zMYg00EU+N!OLoKbK}YL7(?z}faD{0!BNc_+!*6=<<y^ivzT_|
zEpnk<B}iCvnH1)WdHXXC31y?0eM^ckaAGYZxpNj`Al5mA)9JIaq$($>Pghl0qJ{@R
z;Y6$TXl4lXpC?RuENCRftA2ZbtCJ+ud7_mjX)Ae`to(eju&}teyYO;B*0b%+uKWD4
It-J8~2kgB2pa1{>

literal 2672
zcmb_e%TC)s6opl#Y`dw-W;QIV+K!0}S%oxhS%e^B%7Rr$O;wc%uRwnb@jJ2VKdE}o
zojYTjpss49#B=99&OP@Lw$7q{8uh!8HCtz~Em!qZl~uWQ7Fo#SAwH-CS*?J#ib}@t
z(|sE?+3^-~BQ|BntX9rpmip_}ic*8%-NgRkSI?eIN5>{Vo!}7JcOv>U80M2>GdRh=
zj1KdI;UGVl98x>7??u5(4o40B{9xQX9u20`)5-Bi4dXy4#KexKKm!hX!U5CVtIvQn
zpDpIar7{4tbsoJ4mccHu`C#9HYCEu34}~{3>cHU9D9Oc4Z;^}OxLRJDyX9<oe+L~Q
zevis_J0Hg)=;^Cer|Zew9_MjHy{)q(^FrcfZ9+IYzqp(|T-^eD2Hj9A4Kf`kK8U>1
zUmBF0KNqE4$4Z4wRTUA8y^#X>tRH?9zsw!DUChoe3v+X8=2zc9lR%24LG1au#rbUh
z^Zr_N@4Rv#0N9!VsUVFlq)I?xwwT`*OEpfUx9y^(`n^~bx3gto7QpyI#E@Zyrd~^1
zggOUVt%|l$VX`wUF$r-$&1?x-8d<$b!(h;fAD6^Q(~P}|aG;1|1sAYHc?G*yj(fiH
zB_F9f<A4~%>!Y6`l;B_`qdS#~Umii33?xwT=@^1-?*VaKt+)*kfwwsPuJ|hLiak=5
zE1aR|Y`bBH(4lfxFBZDuA`zGP#vjsGAN*eT@*ESiXfKE=IB@r24j>^OTmzSo*Pas)
zURz+MB}JEyP$pF3oF<l3r_fNYV8-QvBP!Yp3~N<+#rb3L!3})XqgZ0|kt2WO07%RD
zj!3v-boX|s{X#V0$N&nDAYyq%ASWpbk9vo2|MUShmzp=JygEFvWtjtBC1>6RnF0`N
za;wxQlD>48Tl7I84#nY838^*XNLJF?<WX)&p-WIQ5<5VaMwTo^k6qkSlf2--Q{~xe
zkwpy7m!yYIY3AqR{j&fJ;O7T<`ab{AE~2`?&!;?YY?RsH!9jU?@=@!O2BzTNx16T0
zE#Oa0Tf94#h%eOdd2E+=Giz4@pEU=Qw_F{7>U^Oz_-X2TG?|`+38zCF{=8y=xmpJV
zD3YvvuC4YIk$gucUwZcOQ9&T?v$XvM@(#`#Dy~<>30%1;gesd<_p`LLGOVRv3!-CB
zLm6su<p$o%IL{IQ!-K?RX@-5=`gP(~0F_uu3YkDu_)JumROCXF+`J+yQJX7$UTN1i
zocsR^3lvY)c{?4P3`bE!fB)%8qIfsz#XGM$8ylOOM;mW8<avFtKQ>=K58Nqy{snmY
BfCB&k

diff --git a/art/themes/luciano_blocktronics/BBSADD.ANS b/art/themes/luciano_blocktronics/BBSADD.ANS
index f341f486907a3a0ee288900adbfe8584d3b705fd..1a34d8843c42d9cb67e4ba6baaca4d2facdb4cd6 100644
GIT binary patch
literal 2980
zcmcIl%W4}z5R}Qy`GF8!_Tu|$SCJCy<QNkI2?XrqqLXYC2zaCr2~2*=zq1?9ucWHF
zM_NlOD;8u0n#Xo`Raf`ScE@?h8c%mz79rMk<em+&&bs5?s4PeQGQ{pU$27#MJI2!9
z3`5Lfg$H}XU~haL;ZPQ%e!=ZLR8_1pb1Fj3V1_Q(+AuL6hT{gO#?<LC0x;_sYtdjN
zIMuOs4w&hMky;Tbhs*&?xI=pw<w0pGFL25tQ&;{-9J8nB;Ju`QA8cVMjo>1UfCJee
zXI0r2%wRL1h<E|j0I!vE$%Dy7vmXCUHc+gTAUR`#Wdm2hz#|6+HldSdOqD)+Bvpx_
zXqI#%IOs@DL`DQGH!>VRt-5jrSYkPYU4!`jJr+<}{tV+x>BS0aD;!IZLI9`-tL9Hs
zCD%Qwe6VMzkQ*eJ9_k54(p0)a!HR7waH~4X4||aqNK=-<VmL!5NLNX%`XRpD%sSP;
zIm1+Fs7Z!7gihLXlo6TXr<929`64UoyH2j@sJXI@ja&^3J%cdJjqQvnKvgL<6WF8{
z127x7v7>Aeg~xz(LTO-Nhr+u{tz@0BkxYZ1=Vkn@e0$TeY`k=At`=tAB7^Y95gw|n
z!dxjlXfG9!bg2ja?eL{WZ_s=^J%qH^0b&EFT}x{Y_Mh{F=$Q7r*&w3P<RMlZN}!&B
z)ozK2d@$qW$>x!E6jpbNR#aE#!mgh+b(7MvrM8a+++4NOlT3R&*SX<jWVm(rgAsfe
z;3l!d*Bc$JZ@}Tv9(n%9(3$R$)j8DHyNT^haDBbVW|J^YI-W}PlZ&e!`@u%sPU-bl
z7=-jli{Fd+&t$g>Q+ODR4Ab(U;Rj(ky`4>$Ti&I6W8BwxjmX{-YM@p~kp}AB^m+@j
z?~oW<35)LS{ARNJF`sRDzj1GjyS*3l@5{T%uWii-?v1h4JMo^)m(#@-_RzgC!h2PD
z-JhFh52m9M^}YJ^mevjNo-<VxzXbpJ3-%lU*|wwj$Ft&>KV9}0m**%C(m91Vx=wE<
zvzzJd6L+f0d2;o+XX@D`3F651sWw10)$7Z%ujdze{_IqCI}~|Q=I`?U>B~;%=;%x5
TRY%W@kMBQc-#(n#YW4pY`DPx<

literal 2112
zcmb_d!D<^Z5Oq!kUwdkO(WQ6oYQ3Apr__W}XrYj_7oVKqLLstCZ3z9Xd`&^y=vVsQ
z%xG=mP<rSFvRX;=-kUcgd9v`cYS#E!sN-Z&)$<7^FwT9S9Ugt<-eGapgjonN%ND%T
zWYL5uE1`?o<%9=wUDOpDX9P4gK{4TDN;x?Vs$-9}Y2oaZa6DPm^;{`|+UML05%+?p
z&%Lo=Bnw7cD5z2;bR=b1<D(>E$@MNXImr+_7?G1YD(s^;%@pu3BT#oGrlh1(K!ui;
zR$u|SBSOBAJNbNM(j*s1tV;5bk+>DQBnF>*CzM#shgQac_Oy7D)fK4&OmQW35C9d<
z3y0<UB!M>eu1{jQ)<J?nexU2&fx4)dUNHsnuJA$87ytolblaXR6&N()OG#Rqrdoyy
zprs6yxyc4_iMI{*3pF@faR{xZbEXusM32~VfP?LHcy{Qhpzqn>uwxiI8?;Ogf095y
zcJxgOukZ)*l?6pr0_l7V*;({Wsx5j6F1SurT32WSSY(cjK!(_08Eg5)9Ia&?ioTRg
zRx{LIZH0Coxjm^-Shd>t+mt*emoS!%kDMC}h6pw$+f&+{2fcJYa~QbKaQ>d5lBQ=C
zu+f&$S{RapQ>Cvn``m1ijdB#~?rD<2&ofLHsmufC&%T%pKkQuX301jZBLDytO|>CF
zH0}$QJ2W=U^W}N7`9h6+>9tT|o-PZR_@G$-9#piW$@VbSU%1;ar`)27cMh8P=4R{G
z%eX2a=M?SUTwYf|jeO(yW5zg!a5go<F%RPh2?Xa!a&G%`yZK(C2GH6-YXvRq3@g6@
z&wv)x-Rf?=+LfRIG#Dt}L}{wxD{n5&i0i<;U)>x9Hx}I3-imh$_TFu7m%DG9^-;jo
z0;W#_wwtfJ`{j>gBU=k-iyG<!!+Nt@ZI9qP+ue<^9p?f+6_}A?p&ZvAPGuH9T~oB2
z9@nlp9BLowHOXtSoVLp=(gN@toG4NqZ<p)a)g91z{@{}R0=J;~Sg8&j$Z|W^>q~F2
uJbrz3@p*pfJ^Jr|J+-e|-}$p&FGi!2lTV{pBY9rFfBVsWd3T{-!~Z`8Jho>5

diff --git a/art/themes/luciano_blocktronics/BBSLIST.ANS b/art/themes/luciano_blocktronics/BBSLIST.ANS
index ec2974e905ea067a18bcb8580a01f300cd981141..c4abd67436ea9c95ce35bf584c04b53766343094 100644
GIT binary patch
literal 3734
zcmcgvO>fgc5KYC617}1e@TE5-TqiWNIhCqHNK`^9^wLvGj8v(PX%ndWud4nXTllZ=
z-puT-?Kmlgf|0V``Fb;N#=E6|5@-FBL7YYXldY^Q!c&!1*@rd?4@|}|g(jHct)giZ
z@mJR<IGT&7#7R_-O&k?P3nGC1(VNB9u>Tz;0*Uc>u$^rlA8sKPTN@lU%L4V=+3D#V
zYr+;_H=AUsm9Z=2Y<~KXNHAFuAC_Iu-`6hq^Xqy3%_YEsG9)mt1hB5CrW<`}gt`(}
znSd|S^I5uRqYn)o>%T%r4wArCdg{;tCR{^4A_uQ63#|9cVx@hH3`yWT|1w#e<ujLs
z>%g|5WBo1kR_qm9ft=@G7gv)@KXndrWRO@N5YjO{%NHr;UQU!<2l>Vzu|5=}l$g#I
zm)B8#HA^oYBoO$ivhC8|9fQWY9$IJGA1>8O`xTtuA-4S5DB(!$@-K0YZjFbdtc2Y#
z&emIZMR2gJ#@AM?jiW9^1qUFJhdlBC{C!V#2QF{{y)%s2mV8hM@PI7MOq2kKFjS*4
z@?c&nl?1VcP@Hg$Nd#A}%mET_Lk2Wla0M?ufYJ$@pA}zafN^nFWr00{QrpFFP3F8D
zI&am8J#2WI6;XM;3OZK&!@X&6Tw8869RJ!4*ce@hhASLUQfCFMT5z*~kcGkm1xv>p
zS$j--abDV6FT|(k8VCjxY``70=uskl7{bCDh9vl{VoTdGH6;yo(5d1d9-LN<C1KR1
zU`#eeHNG4OT3?BoJb!`6=*KQ+hhrhPK$ic|^KpdUirzj@hR42{98w#h20WT1EJPqX
znHp|Q$GSTTG#3e>OgNXynInSoAsVTdIxn*X#M}4C$|PaP8=fwIEhNbfj`m+&PzMea
zDakIrpXsfP15;J4Kd~s41nM~n17gS)nMRuGN)b%7lV7IF#ExGnd+*Kgt_nzeR9YEJ
zSXiK#abyLr$%UG%Big#<8(N=zgq8uC;ALqzCex{?Nsj7Ur*~kd(uac3Cd=OPzrA&-
zhMDmJkdyj(&Ma$VP=^Z9J)Kl2H#Q(`>^s_q<G?&{&Lccy@i9WCT5$7gnWpDZdp4G4
z1wNV#nv4;20h?bD+b5Y53+=zTagAN#z$s8`EnJN#MUyZHCY>x{Y_*t#+;P5Y(P|+?
zMH6A(xNKyiL^^5^3Dr5av_$@ji@Rz3U8j0O=J|?4HWY(5phDV~l_gD=#BxV8A^?^l
zLP)w<D*B%@TqJmelxIhKpZ5>qm^KgeBylo`cjDp8C%xXr#>d{%o;;7<zdekO-|gwn
G|Na8ttpbGr

literal 2392
zcmb_eO>fgc5KV6=S56QKeCZj-aqNDaid7*bDj^km$tfj9s??2X6R7&Hs{S2Y^<Us8
z@ZOtU#|h<zk+QS9GjC?z%uX52;^Q<vp2RL1&Bm^&H(%Sd4bH{|gv}|WmN!wvUt1&S
zO$%+M*bJk(9?kN!sOuduf*ZKY-2TPcm>z9~|IsX&7XI?`ay6Pw62=78<=mA}WspZu
zaMAvkPl;@`0#2Gz07~3>op?Z8(=VV__p9nhz+xy4SQC$h)#4Znf!X&F1h6izm*sjF
zA@vAY|BXP7gmG711_0%2dFBjd>VdFs0nsjyb6tI#udk|QzzAt%-WF@m7Mp`$xvIXe
z@8-81nZYvmmRPqe)7UJ#LR9M#g|SKm;{$Jub;~$Vm$`DezP*pCyJdMBjD4MfF;U)!
z9t3LuY0*V3nrMptgM?yGL_0yUPC>U4FU?(pvov=6P04ZWXu}>%xQ7Oi;E64YL#U!J
zrAM7{Ry6$7Bt&C$Y0kF7p<JNHgyByG21o!|XTdkWVWg18#KQxr`EVex&#-xFDT+P3
zv$m<Rha$jW08;?swb7_E1_=Hk6R*wH>zgtjAk^ihg(^rYun-t$aG-n>95zGVdEOPC
z#iAUQJN9YfNJyHAN+uT!#6s3lVr1(fa|Ey^$O~AaL+4Em8To}9-~OWakVQ(|o43G6
zv5vGeUx{<oFYC};{(Uifz`a-yYmSidsTi!54zv^9-1<8N^ISgOq?dRwX@fct*k{ZT
zqNR<y?#u@eXj2tbcXSPCKzg`R20%DHFW%ko42heA#NGV7vZ0cNoH;o=`uqNsErV4U
zx*_qFg))^LYRCq)R5H&22X#jXd_xHUV$5K%(O&``*~Zj>W&X&?Chwqc6@RucbP%2i
zSOAd5pl0$MV1LzrzE}_llo@08m^WOs_VHjhkdXP~V+d?J5v$xLOwW+-p0MlNLN+3M
zj{$wP<9kyI-z3{b!W%UU4iWIdQI47|p38nwUL!v10z3fmW4!>`;ztoNv3gnH#wezc
zxrc{Ptey^T)C(3WQe_a}Pj4FAKn?7HVvm`G@DKB}2wf6@anrN429oa%Ng&(k90-C&
zAPiqLU=-K=(Ztz>0Y;}3B{U5WP1Zb=LRR3Clf)(}|1-kzh_4;KK0o<doW?QD{?nJl
g<1EhO!{09kgT1}agI5E6FF(FNi!MH#*slBi13l0&(EtDd

diff --git a/art/themes/luciano_blocktronics/FBLISTEXP.ANS b/art/themes/luciano_blocktronics/FBLISTEXP.ANS
index 73a567f046d7f9abb4c673a8d5c7d4ef075e0067..8ab58f05ded3fc8cecec24b2498caaa944fc5ac7 100644
GIT binary patch
delta 112
zcmdnWw3&%nI@(|&r<Vbc%H`rxP>_x`Hp^8F@i7E4%uz&)q@xW%GC&%rbYimsFIb6G
suw$sRtAWA9gKiTquu2#i7#SN_8kp>6U|?Wm3}D~_(m=p8S)Nf00O=7J^Z)<=

delta 132
zcmdnYw3UfdI@-Y6#K79vd?K@#0T&mLo2#H89c^rus~X~C2of+hM-nlTjy43z7=cwz
ztTo`|k_vVVb#^r{n0U}-;stg+BLhQA10zGzeGCi?jEn&cTtFHKggu>n6~f#dAv`z<
E0MuU^A^-pY

diff --git a/art/themes/luciano_blocktronics/FDLMGR.ANS b/art/themes/luciano_blocktronics/FDLMGR.ANS
index a85ffcbe85030509131b4e8fbc2a70b1499f4768..a5c1cedf08dba7592e3aef98a006f4d9355b0b4b 100644
GIT binary patch
literal 3398
zcmcIm%We}v5Ol;X;sX%A%!P9{Ys(h+w8U0GiW5jgIQV3Nkt}&YgvWueit;<V(*6me
zx_TbFBgYA`Gl}e-=~s1iZ;!jP%ywtJ%$n}(&{kz!byZhgNKIT&89^12sD`InRE?2O
z{Wj6inNUO{iuT>HDa#~84ECTW=U3g{KMEMg?OzWHyMY~_eLOumE5>G8oEFEEbMTXm
zRI4{^l9J*~A$V?yY1He%mMTO0Ww}~>o!iBB6u_DNvHY_Tw}|z>si*Mo*r(aCAy9gW
z4t@sq#pU!6KsHizM~o=GE!uXBMgRJAOO)LP(V~a?q!_l^w-eaPRcieBu64?UceQ>T
z+S4d;LZul$Z0~p?`jAVx<0wAJx)~aS?s%m7#%%|!%J{~=ndU?`9QE=3bJw~y?#(E@
z<hH>4IFt(s<Ls5rmE3+lSef~1<tQ+E#e}4*t=q=M9#2l#fG*BKs~g>+>m`>KU=D0m
zVFD^sIW~q{?E5(fGI#-fePIO-WlUm=(U}Wl(4|ZW7Lg27=^T+;b*m<z9C-&xfCg3Z
z7ddyf=j(X9TG(&DapmaX#^e^meetY`s4Z~;)e!Kp6raG91MX@ukgbzR$}Rziu<ZkC
zN`g13y*fN76_h9ikcBe`fYu>Lm6I#rhNZ_ZnZO#<9j#0M(`qrlq6P^_ZcDKwfF>p~
zKt-vJldzsX75YPZXhO#b^`ze5B9H{<P!hsm7`%#>JHnSFNHu9_#uJ_*7pk&}XjdO)
z0i>Z&j*!U(C}A|_zNxnvQm`PngHdzIL5hZ2$n56Eqho?08!f4~3pDvgf}Zfvw8gWk
zDIMy7VVbcOnD^V{l#<G@M`1CvHQyb!#rt(_@%`8Gr=I&L;iisMcrN6f2|sY~$j($?
zKn*Qc(be(#+B4{Z1_HbQrEa(jj+|JUYQUf8oCneuQWsx{&`%9-4Hw#Ko=-<)3yHGm
z{eeXpIjseF>)3#fhbTQ(H_{*}HBQsBO4~6#uBB8h4{$A`u)z$&A+roEjlUBASkTDq
r^NZrc(Im^Dva6M6c`tjJ^{c0y&fea;&a)2Jlee#@=JL4EUHJS5Z{1ng

literal 2337
zcmb_eJ#W-N5WRHhS}M3^o7Az_7aO?hNKOGMmp~$*xGI7}igXJid=&huC>_7WmiC_@
z-kX_S`;yQgTsYp@nc4T=JUcg86|-qEtBT+zt1@(Lf5k3#lT{HAFAs2I5@LM<o+6W+
z<6ZwcE7?yKvLiL!*tM-TY^G_uZTqNaQRRuGYUJ+2Z#$T=Ivk$9J2^g`AG+oIWPY?b
zLloF03l)=<Zw7s3&v?nfv#Ju7#ugPHFE{H?7h$cad_6oL2MX=*_44Q1@%$nT(Qb1f
zdpWQUyKk4JFqo|BCj&fC$<8Tw4v?`aVek8`G|S@YRr!}J%c=e$r{rnF<EtS`ZQNub
zBgPgrSmi<hhaF^6^hfnH;g@Wq*<=qy%-DjWsj$lIx2sj+vFnmmau)#UVz2Uxr6-DM
zJ%fh3vLcqGr4MtJPq;qQ;rQ@jZ{sdDo8&6jjg?zXC56-B;+P?&ScE;@&k|vZRziv3
z$*#lblOTAOCDv09yWkHpaMx+Wtg=+t9<@v?m?2wq5tR}k+Ez<i9D&YhM=^;qQVZVn
zuFk}r-ADXt9X|hn(UBwMAR5lbGe;%_?tlZd1{`oHNMdC`Rx$}LZI8T-g}~%oK+sAC
zN~DsQ($N8WG)%{%>VUl*GXNqSCv4XAKyDs_Iy#EPL*E*agG0hnsAd<u->fgLY-qJ@
z(s&FBfFUMPfCT!To|&+hIt&``i78T>F8my3k<c7TXe26XTP$Q864HgH@tvbvTI$qm
zk@98lUZHJ1f{AX!phO-Y7UvM-j<e;Xmjz2|s4FstD3>Z`qaqKwnnBRIxk=ErsR&Sz
zNtQQ_l8aE3EyYIa4waJK4FO4P%g_%a;Yot3G)@c(3p63BKk&J7ukUlim+zO~avZM(
zPuem?MghU)gDskEy~&)?P>$>Cq}?6rX#+~+W&?GSV9-=3(`z&XzisIqPaYby8gvjv
znIbZ3KWU}!B%6t|OjCep<xS!drF;i__Ij{=>LSMw6K<k`!5F+1>eO_%qLCx%%T2?S
zl>de34~8heMB@1I`TWhnq9{=Lzb;>tP2o%b>%nNWv-4{7Xe8Iem(Q2(?a^FU`Thsn
Cv*c_5

diff --git a/art/themes/luciano_blocktronics/FWDLMGR.ANS b/art/themes/luciano_blocktronics/FWDLMGR.ANS
index b0e7fffc2dc2b2135b582710406cce810fe22ed9..a50122639983eea801a341f90b87e1e304996afe 100644
GIT binary patch
literal 3532
zcmdT`O;1xn6fJRQ;@;TJY+O5iZQ5v81sXJ=pn|Yq1z4m>M<ap@e-+{HyqCOxLOl1}
z`FMS8Nh8(7(Ujh=bMHNKXQs^)>zXHR>rC^c<%&G5vM7rttR^kE^x+Cia>KV$T#b=W
z{cBR7521-cG(GidljpS*DcK)=^SBDTS{8JlxqAk7ojD$EvLY{U?;r2&?hm%jXs|cf
z8GZyywy*x}UX_}9we>;*!>p{|ZX=d1J$G|8U5x|yyNk(m{Pon0mqm!rkIAoKuUEnC
z`$we9D3GnLdwDc!f#wGZs}s0XUfk2%tS*gT&9EfPGTv7Mo%5Q_GG~5_;=hL0-HhkA
z{5!PQv!q+=F~p}>zXhy5_LBQ7I1e}&hr2Diu9FecExuu6zO|jihw~*G9``L|kr9X_
z7J0f`-i|W*^!gnTN@?cNS}{E_GIu!G#I1$f`c1g%&o952i^+KUnfsJVSi?~IoOp5C
zEqQ>eY0plt&o5DX=wEl$Hv`wMD+=7OYR@1TijX^*lUD|8Af_W+_-hy<9)L`Ef-h}?
z+6R_g)-su5cM40r5N&`QEb$;hA@GXMsO{k{Wx87T3N>cV$crg$c@tDuWB2VR9w<Hs
z-r1i-$)&AnK30l4duRwtE0)4VL8+7g5xq@FKq_g;*F1{>H>D+nl))VcN)9bb3T#p5
z3t)7dFSV0BHpH=%+|mi6(e4&L=Qj6zIzGLk2k<SMsZ4j=uxd?Y!2f#aO1~r>O~&qt
zhxRa-UPnKffEhP(AcP5vx*)*It5gt)SfnBso)Q<qe>u^9f0P9ff{pTo3=cpFv$1!~
zNu*OesI1-0iI7s4cf=@5558bgqU5`~P+isNhXUMa7m=ngNC-+;DiBWClmY_)+o&?3
z`~=)8r^=4uj3T1vN}eW;#fL>>@%?6Ut@@B<!ED4zu&MDU6~1yZV{^iV^2#o5Z+-o7
zq#^;qfJQ5D5h(Oc7@&#)+X=P){PmhJPZhKZgpL{^B$79d$CC3IbV3jDz@i=@D8fQ{
zi`alUAj*uDl{QF932j|h=s4EZrEJv<0-)t`tT4lL=*)rx{LAql3m(?JI2e4|8d?jN
ib*;>1ZTs4G&Ym?I8yoK%&l_A%-ffP|(au1n`1u<-`FIxq

literal 2410
zcmb_eO;Zy=6a;T_^`yD%#k2bnvT9BNQfL(c6@)`hh(S`7(GtOfzl!4TWUJ<%Sa$cD
zncV<hEccKwZ{A0DzxOuurund+53Af|y=mc^W&8NXH@#`@U@x}uK_}Q+2mIyflx6(1
z?<|CD#t7XgrrF4rOG{Yy<MndcT8o#_3M>GGr#G!i_glpWE;|`-=^~tW4o>#>4n{lK
zWVAop9e-fd(EO_!u**8;LlxZxmVz;?Dsc|n5pjLFV0zRPJa;}{%)XwwnHkHR+1!u$
zFByofU;?PpC9z74qNwt~JwKil@FuW9BFf09vI?*fOiH)SvV%YK0S0?fq4I-X!KeBM
zpMur8<*P1AOI#;KJ-QhXRVfgVFeN2bk&Le*etCz<sMBb8v_2TC#47QsR-$ckbO|Ys
z_KG}exdQ2)TavtW+sGQI-gqX%ydd41NlE1W!4SIJiTF3waS}QjZBg#ry|$Rron3s%
z&gZkmXAGA0G|(y?W|aL|_5XBwb#}puS|jwF1Bn`h1qe-pL9yEshfGJD`z3}8U+}=E
z&4w`JXn^IeJ4#79oH^>MR#;jKS#qPAbYlPno7pY7f_BDx2LA=Xp`F|;l9!WAmoxY6
zC-wl;4K<?KWRbWB5b$d7z+*s3j0T<52Oh&6xd$eK%C3N92<fO1Lws~c253^#9e<h@
zLKkcSfV7O-i?3}dxIiIrf<xqCdnTu_Ql^BJ#274Qr<b8|ctPosJ57@SbTLT*5@>H)
zW@4{6G#i^06d43v_+CvSAvv6oNGe)d9MFScvV*yCOF0%x>Xh_hu>5uRpwOW|!bDBb
zD9Ka0@gc-eG?d95ri5}1f<h{T0DR-prXpeRdQ7p{mVlN<(7L^i(8MlWh6ErJ$3AEj
zrwD#&q?pL2!=waMn8cJMR%K|L5%EMpO`1#t3Zk|1HXqoC>^;ccTk`MM^Q&aXX0X!A
zP$U!(+};{t{X4YaqeTyL+}uR%IzEw~VTTeaSw|h?3s<#5Gu&_(_+~>{8R87Z8h_DO
zGFm=UPdmwEnyjEH7YLhUB?|rqb=aFVyzV^P;3ICL!MxCT$JE%+-LZPMqz%{H387R-
zKO6R+hu6O}e&gBU=;QV{&k^~*o-!}$ye!H`kJr}L*Wax@UDNaA?baka-W}N~ef|OA
Cy7z?u

diff --git a/art/themes/luciano_blocktronics/MSGLIST.ANS b/art/themes/luciano_blocktronics/MSGLIST.ANS
index b67b31a6746fb981bbc768d3b07c89fb036c5cbb..44d5163dd855b97195fd0a0c2f494eef24f19769 100644
GIT binary patch
literal 3425
zcmdT{O>fgc5KYAm@dFBxz?a+|Crt!7g{VSEL_!oQP)-F!e28rYA@H}V{)YYwTk_B7
zmG@?5*K0dD1o^@qlHHxzH*emI*GYesy8ddEx}?7vx+1SeS(HT|)}$J6nZXs7$_=xU
zu1UgA{Z6Wbc0^2aNKE%_JIV7#h$`4W%?wvzqbSI3l(~za>kCQt8P^jxSk4cO0=6>%
zxy@&bBuJSXynQuHqg3|s5EtPxc>f{8WE$&xAeqR0Up&q8a*G;+_(ZDA1a2)6eA}+u
zY(IW$dfnazM@%svI(~=YQ6iW>U#{9HkslHKvcmH_HK6rn8%aZB-%?3kqt@s^0~?$#
zhyB$FI(9Zjg=AH0=SaT;rn{wP<99Wh8FhsVoCb7<$p0y{-f`ikC_7Z73Eg3bBqg7K
zz&h^`y1}~9FuLqeBzv0bZ-pZ7FhT=bl+)J%F71;}0$CC!ok7aYS`;je*fWQ@EV0Ig
zL@CD;2YO@PN_N#@iFa%^qlGsaY)pW6H?Nr7>`q~2U)3stg{>hR040ZazGB*(m2eav
z(Wjt^p*%>38?wTaqD!+ewH-OwktkUp7=XEBsVR#^Qw3DmGXf%2xWCmdn#fxe9pm|{
zk2x&fV4FL9Q3E@3oAvkgr(beNqqJTjp%^hU(Sd0QL9<Bpd_q!a)D0a*neaKWRQY?z
zwm>Bq;1p2V1M0+sBrI<1R@Oc*l`9&9r_{x4R(NR{gD}YmgL61vXxp<bOqk<`kDrJ%
zK^S-Sd#$pV6MyL;Ms?3{-{_PwJX*}k%W!k!Sw@sS0O<HO$5b3NDZh%(Vy>#HEW&^n
zwZ~9J;<_jw71yhjNXH`T)Rl;3+K`1iJzL0z0H!V|@?-ne8YL(q9S|!LGJ;g$*PLqZ
z`GGvVq^QI}GS}B$$jAp4X&Y0x1{aB?=?jc0u%o&ZGnQqK-Xg2%S!1Fcyv9J1M!>o@
zOs}>k@UjF;7OF&euZ>8<-R53V(6zN)vTij5K=U@NAbHHF=>LpT{>Q*0b&t;G?-r+N
lN}rBKmS&^$X*#}p(CZx?z3v_NWZZlCe3_iTnCmKh{sq+hey9Kd

literal 2264
zcmb_e%We}v5Oi+HS1trguovHF*Y>W!Cu2nj2}_7T1o9~$i-(v52!Y><@(uorU1@%W
zs_vfIvEv);VLj82ny%`eO-5@spSt<P`C_y#eb@F+=t4JII}dxg#EU_&^#ND~1{DS0
z`de7aEM|yDa=KyBwhGuxqq}Ws#o3d}pa0yPW8wT$?rT3@EwEq#Q^Fyl@K>L#5{aq&
z_|41G8R#x1jfy*d_r5}U1EBiJZjc^yaSazls6~W14%*6Ie$DEyu0MR;kJ@fiAeLB{
zp1<jdDDXs>Kc6q}qGWMIh}#}7T6Tao7k82LXxNR4^HdnUF@*8isvNCn^J&F)>W&K6
zsbPIQ%*`a%D-_m`U32lT=77;SfGuXJoRy@J37D8<P4zKYhiO=J94NBtli=;b0jnq_
z1kiO1(+q2b>98bC0B(Ss!`gQph8|(K6BRavY_XqKkQ+aUz#Bc_iJU8J%lWjnaPje?
z(8YVxil0~lt0^r@>5@kakdg>TdX<aaA^R*fI}K+wC<>3B$|`A)orun@`AFnI#g>v$
zizy;0SpWe98xq7)i2*9vtN>9$I-`|WLSOU-UDcM{l#Ix`d<`=#yzv08{MF{$=Ho9(
zk|W?{=ablZEyA3IOG)CP%*seuOCCBFl1<pKdpluptHb1silT&GP}ZPWdLH%ZHGmJO
zR*N*&M#3OWB%!ZbpeU+kgIM_o$B!P197zm+`Fo>M@ND}?=VAnX)N37r4l<oq?(J=?
zY?q0)Q5eYRnnZDUtm-@$YgLjQj3|a|Pldi0u^w$xR7O7r;L`ZO)^Qw!TjftqF*qWk
zP)#!Yxc*`jVWDv*QWel!Z?#?Fj22>YIc{#O5E&P3QJN0xYX%lCHhU!(T11EicQofM
zr1p9N6I6yEE{2GViYHL149$v)013o+Kv~C+0WO1@8l@W8fq*)MKWB-b9T@ja9lnr^
z+zVtk`gEScbPGy<PxbG7kbfY;@Zss=?efGq;{B(ma^<XarTczwFgQATH8>u~bN|J&
MRdM!wp}X|{3sIZw6aWAK

diff --git a/art/themes/luciano_blocktronics/MSRCHLST.ANS b/art/themes/luciano_blocktronics/MSRCHLST.ANS
index 4a9982ffe23a8023a02320f661ecde3a790b627c..73a62a2a73d607d46d64ff6dc63464ca0186cc5b 100644
GIT binary patch
literal 3328
zcmdT{&2AGx3{J%j@c@NLu$SJqn=}#RRH6zYQ3+A#B{xtIAf^$tfj8kfsy;*CVpp11
z;rndQ&u;b<t&o^QvL4%??a$tsWV|Zfcr__qF<u?JrcTQ@z8OPXqy>`&Orc3;c=9wY
z3V!N$ksQrMRN^G6hqhhRbtgm$w%3#4Dr^=7)lFvZYKvOS1)f;#Vp6$#2`|FTU2i{r
z>+0`&R%YXFHiQOHSUKS5pBqL>YVoWr`po_Qvc5|838ZCKx}9pw2e?O<=f~sK3A(bF
z2C3Duy;xLsdIIl<*5}o!iE}g5`iIa%r3{=-)&nB{r_g%(#CO;a$VeA@z~L)AU(T3y
zJs@-^>(0QaI3P)Ol(x_7rXDat2U?iZ<MQbJo0EM5!MDPhJ5LvvRbu=Zu3QLB!~WP^
zfM*dQ<18hg)0sn#Qy!>tB#X#<V?j+r!;%(qrSJ%=A;`U=u(Gd|HBlpnH<N&=IHyD{
zHB;(UE90a)xVH>N;v@PTX<}&}OotmH;dN2bbS$l>26M@Z1%d&XIYcd4G+HWi7aCFm
zl3Tobj0SQdy};Ng;h}mnSiZwHy<TW`mAhVlUw^t0Cylam4G~Jx$TJfjSVpdq?uCMc
zar6yiMw;+Bvr_qU#kP=2R9J0+Un;nTFC7TQ(s*8T#b6{8%cZ|%0S10-tImFGeB}-w
zKYb?DL}J|L*IH>I0id5h#7Jj6Y!WeEml?LQ3N+l^X(8RJw85djk*+XSEprv{sb)%x
z0!WxNBkjH@OWLx)QXvxykGb<~Bi{-elCz7YY*^KikssTyHYkx1nSh)TU}!?1DxL|-
zc~&E=q^ZO~F}Jtog+#Q5$U{(|VHsRz6!-&7$bYxH?7j|)nAbqdAVftIiE4bdEYvG7
z1SA;*$gL$VJ+BXq0xi5&eO8Q6<FVV_YZ{vFY<u>tg#c(wbmmSsOGW<%c=?+Fi_$&0
qIQ_6ZD@)o8w5qb2l+VlQpGTw7!NJ?n;Yikl*DueD%U7o=#m~P8A7G3C

literal 2219
zcmb_e&2G~`7));{S1y!D;0t$qlh}fsN>m{vDj^EJ<OT`?#5RI9@LE-$p>JVJ`zoE8
zZ+Gpc5ki7JB;N0DXXg9X$z)Y7X60g9`eL%GeAo6XbfKH9N)LOr#0P_5>jUr<7*rJe
zwC^IO%u|Lu%IU^M+gicr=B;@s515rOOdYq=h6lQxJ^cdEwyeUq+MjO`3hXKauk$x7
zM<O&{Y(IY6_22ASgBX9gVQCafYgq8}&y5gfw=#uV2mb!DKJVjm6hRT3;VQjRh=H&_
zJ3FZ+tNCK)sIcuQN}V;#q-k!ZLoJ{>EB&px*c)B^t2v;z;eHXBGr(EG9nivT&1@KK
zM8`$P4vSSzg0~BMtkO{gDCPS%b37wVV>FLr1hb2#IC-4paXf;fR{O5Q93xS4glBEB
zpE)!PUx?tGda>kqVOuR`H9Lz~`8fM@@hY_P)2XtugBDhoJqAE+W;qgedD5xJAa!sW
z&T0S(%TDFtG-#(ba2tIj5@G4wh&ZMUsHGH%OctmBf(;4c(TJf`wnYF^LcOy7I?<Qh
zpljNan~{;c%Xcu-^1`4wf3g0){&cA%9RV+AA&Wi4BIX1xNb*o-V<gtfL&rk4i4D7V
zCk$?LL^+e9fY1v{3|7m|qdvU`@S*CT1de?XCXNk2QLT8noqu%r<f-JyV))IkwMoIV
zp_rz1AV#od-q<1Npy`ZoudfrbyG*Q&VxZBD5~blmQl2F8wxKX3*|10yLndVX*?ljP
z&DxZdvDX8*G(NC(90zf8{`eGwBN0V4%kX3SHBLkfO*4^EpqaYob-cm@T8J6Sadj1e
zXk6?L<mrfg9TZC!o4wM7Mz#J|=3Wb_y~&nK4JydR5XoruOuf_r%Swu%5{Pj|DiV_@
zxC~}$jA~#90^r$ut~c(OI=nL(xf954^yyK)6qH|)_R}5opCF7MpB{Z!9+xHS{io&1
fYF?F9xqL7h9UQzJ9gegfzJ7U9oV_}-UH-fUJ7L`>

diff --git a/art/themes/luciano_blocktronics/MYMSGLST.ANS b/art/themes/luciano_blocktronics/MYMSGLST.ANS
index a56197bcc6fce15564c05499a6a4ac1d26e5aacc..7c49c1feb136b4bbe0fefe48e37eaa3370f7b467 100644
GIT binary patch
literal 3267
zcmdT{!EVz)5KYAm@d1TM;0t#*38^5b5><#pB}7Fflp81r5Zek$;J2!NL;u2-{42co
zW_G=HN)M5R#2#$#&g|PaZ^q+fyeh+ZH7!FiULAzGYDZHy^%&No9dKE|6_(ZwPYqp*
zf>*m2?MB}slQzk8-<ON3>K)M@w$qd28f<n7qMOdc`3A9;3p_E}#dH#GvU#}NeE6Ep
zWxu&&2=mjA3!)J#A9mpH&+Bv9ifB`~e`D!JU_CuMIT){=LG8sX&N`{sNga#24BPVT
z26xM@9yIG=sPPY>hoTIe9_s;-|5Iq|D(T&922`XEJz((_4PVa0x*8C=$GTTAHXTqT
zZ$8~VTvr30(1RW@!!DI`RsXGPro!7fo;AfBZIjZ?<^gnO?491)F=gvt&{ET}q=&u=
z>{gZAgTZRu)Txt2eVQZyrOo+A(#bg|el1lw=8jK~qv(8`eh8Wv#)EXYpc!<tsoNOZ
zEiw3(ELb2ofV*RAA<JT+lDlMR35Z+z%9tJWNn;8x-7_C|SiXgsyIvT(Nw{2pTYvni
zO?JxG7l%-yku#GH3?sKFdods>j=bSrq)fQZJyibU@Fh@529GW3O9Pj1vw|=zJFhXW
zD2&$SF1Zs7_A#w$5K6uav;Xk%6G@YV2^YWCCJP0C{HZ#8rU0Ezqv4JnR#ArQYYU_w
zl>k5|mbuI2gySsVi)T~SWHA68)7D5gFQ$^EEUHwfVzJ{eG)yDk3fJQJbg2c8Gb!?Y
z^Ti7#DWVE!J8dfoUnD?dL2KPtiP=+9iGyISuKIklvT=nwaG6+9Kfpx(+u3CiS)nAf
z3_>O=Q0VP?b~0kS6p0jL-;rVpFJ4@)ZB4Y%aM@oQoD#Lc6Jo_`f32?Ry0zReZyf|g
zO^6nf+nkF1l5g}+fuV&*r$_IW$7M;MfyShqOv~rx?EQn$Xm9V$Xn&+}@Ab=*;_TIt
H&C>M`<uFpk

literal 2122
zcmb_d%Zd|06wR!JY~45pv^MVhk#wV3jbRWM1LELpvQr`|)(kpEe`}a;n7`<P0>8v_
z?!8rAi9rOdMR(VIpL1_j&(_s)UM<_oyV<(-VHj5oG0fJLhrC|lK_kdU1AIjqImf5I
zow+QMhiJqnOx-YOz<!?8!$2u=x1GP-A{T1uq?Tpd_`727ueWbM6?@U&{b5PW_g}9V
zjj_t534eUpT#C*m9m^vT#Hyv41Oc90oYk}SVmWW9)g9UCGS&=+;=V00f*nTsTd_N6
z?fz99(S!JV5E17Bb8jMAlcgCAjTPwB1$ItQWhZDuJRlVw1pvrJhZPH(sGn`WLnX3U
zWUvVP5HMy43+DzKCtK|24f=!^Ebv70n3@T&t(Wu8%tgo1q>7U|h@P=hA#fR3O2`^5
zK)TCt#MxA-sidKBEwUk3kD{<NE32eHcEUclrX!F86`M-|Ex8D{M1cqZ*b^W=6&ONg
znH3;RNQ<=cM&N@}1SDBX6^YCAu3ke-$uljj@z<Nrn|I&DNmAJ9$Yhtb2yzxKC5eVK
zD<VNHnb5JAWrBv?+cAS$6=YAB`l}y8Tf;S$<|98N2gzP^(pVb_3&E%s#<)OHWXsNU
z;~yM9dMtEgGW^x|jZ$HZ@ml0CB*;;hYOO;#3#?G??QN=T9E}_RC8W_ciqh~{)upe5
zqggTg7_vPU#$Kd)5}(S9-U>Key^knW#(`C!bEoGR90+7v`Aox??MIskO_paO@xZ@_
zo@zV71uU{4N%+zEo14U4VFQf}z4f&SR<I*V!XJMc0o$Dxl6#I&$^m^5K~yx6fz)^c
zRwsqQ<hZ5tfk*(x1a+4#1Kfuy>J@5a2O?YrKWB;84upH6fUA<0dxq@B=*}#3H>0O1
zss34`{IcWp;rYp%)oE2R-hWz6RWItQu72K|OpcCTO^zqB?!SC~<}O~G=q^8h0Z?wp
AJ^%m!

diff --git a/art/themes/luciano_blocktronics/NEWMSGS.ANS b/art/themes/luciano_blocktronics/NEWMSGS.ANS
index 904399929a667f16171632ce890b9ca08f9ed634..6345db4a2df04a80dab46320ced6a4dd82e6b82c 100644
GIT binary patch
literal 3480
zcmdT{O>fgc5KYAmiF+Xu_>wC)PDn&^3Q>iSsDvm~pq$bY@s(`_A;8b7`WyN$Y{`Fx
z_hx3-8z%u3`NFDlygRdR-@KXKb=%X_wWqz*CGBa~6?xUlqAc35CRKyW2(GYHZg?x{
znk0PcZ&FRPDPodIV!Ca^NuJl1s22ODH^WufXca`)%iQeSd?vvjus?8}qwx(_0oxIP
z-1391BuJU-ynfM5qfmD7h+J;C@;3Kft7vrRD`XaQ2a;RTzBc;!wNbZRoqn!+U0(-B
zyyCs<_#2u>iC}(yyx2sE{D|PY6`mhi1Dc<2BI(i?w@^}7%P{KBz&a;K-S+e`>U7jc
zUZl5H#M^}Y``C7=S?*1>dPGg(0;dMuAo70-ttVSJAIb(5sY5qdAxX&{5Lo98Lf2T=
z3P!sPie$TK{Vpi-23M#-i*kAibl$$}HL{QeVbU3-oUBE`)QCNEc$Y5vIFKl1f8ao`
z&r`{cI&^WfW+Pg7lEKCRcy{xM$<6K*R>oDWB3M`&!U0e+*<aj7WAaLFz9iv|C70N8
zzL=kV$LKJes!=Q&NW=@QhM<q8{791n(!&nYuGtv!me_1cBmxi&z}(SQDa4`@04j_b
z0g*7A>lP!ml6X)_p1=B-!~Wg-4`4`L5W!vin9CHOu#KxFBq?SlIxq|&Xcoz;4@mHk
zPgEXd!gFAu^6SWkKrR^I6i`_k>coi*LEKoytckotzfwe9{v@|$NjPDCq1!>q#gN=D
z%nx;NU>$rjd|iFA8X*ZR%I`m#!#Pw5RBAIvlrv+p04#*7E6+AI8h6mrsDf-Z-9$7j
zAb3S-P<gCU>TAdOQ9dfNtym;dxmb1RO289KR3Z<@@26N33_$}x;!|?5NboiJUTP<j
zLhanPzN!R{qDR5OOK6)YmzPEd3~B;+0|MnfmA2-jaRaaV%!|^iu2OiK3)N$X&?376
zYOdu(g0s%@!T?Dsz<k`{@dWHr_XtlE4BRWxRFBM^&d$F05QNm0ea7Hyt&&%A83m2G
zV29EASW(b*W4L5u*AM_r2v35OtXOc^@;{dxe`pNX-8&w?nH;96dNuOQ(yW(0N&64)
Zv|4+6FI)R9X}6v~JxWfVjkOn^zX5D4jwS#A

literal 2340
zcmb_eO>fgc5KV6=S1y!D;7iWfPMQdEDpiG$sDvm~pq$zg@zrfrN`aqM^~|yVB9{DD
zc<;^Z+D=P3fDg{j?Cje&Z)VpS%=6hepN;a64dz9tmd#UFbv2mh0sdkOF9yNa1YlG%
zD9iY^-^`b6#1)#+nyQ~Imj*Z;$LZygUhF+8!~WOBJ_dPsLVFU1JDV7gz?g7|$imqN
zXQG%g3}3$}atG~V{&}ZKI6em`vYsgG8IZ4J>({;E?EK*KYSh(L3d9iOBJejo5d||5
z=EujA>nN=_B1E&ni=Gb9;`lm}Z4JMtk_SqPVmQKZZ>Jc{H)i9K^)ri-PEv)Mc(|vd
zwu*J;1?al7e|6XBg&VNt7IQL5JyN4Zk~i^Vuys#AtJp!zs#%2Ds=mQ1rIY}wK79Lb
zgfYTK(~c$pcR)7YBvci;9AP*FC5%ia>~RUX@q-AwQ3LMCzJgiI#uE?M98U(Pcu<y_
zCzfDs$&ys6G-Cu*Cc-H_D^3}<UV#?3<1xVMGMp`r7Kh)Ii1FlM?Gw?r6|OS^pDBpr
zF=mL7LzW6d)90A%Z5Rl%^y3oA&P;&-5vHVvp(QVJ?sEcK-ARuUDHTX!`eQk=rKJ+w
zTYvCS3Z(qQ$@hh2??HADXlUa$7iF%yD6wQIOax`Eosd?Ye9DFu?u03K3gvP}MX_rm
zC^;CGF`+(57cK_sZ326h#EGp1QXRE^N*pPJyVDIMbb9{D8zM<!E#aHt_SR#wu_neR
z3UGND`E~QLVk!?cxeMh~qt#xEvFXV|Is>%YiWYyVRb|%(dSDuA_7qO7Uu0##SW4<k
z1sx!PZG=zD(NTu4%X^$^&0^og0R^?w??=6r6k>F!84UIp7g4!Z3})2$UfUK}yZ~4)
z9ejZRN-Z4AnCQngihE#L3&A=}2nkP6cBG?^cZfCsCnOg2D8u$H)62sn>2lgk+2<An
z%W$xN_(l99h|Um0akH8_HA_}wH%UhBywTuXaaFi{8MzY3@-@pRzTATz!&G(bKSQlQ
vBX$4&?&h1V?K~&me|pNi*eLQM|8=L=TU&eCTkq+)`~2xnw)bq)tn~g3@CyIm

diff --git a/art/themes/luciano_blocktronics/ONELINER.ANS b/art/themes/luciano_blocktronics/ONELINER.ANS
index e41069e099545c8ee0d23faacf588df05a2c1731..690db12ed5fa26cdc5d70d4a8a33795dfb69f60d 100644
GIT binary patch
literal 3061
zcmcIm!D<^Z5OwG+{ee<nbje*=8=GbiB@LnUU?`-?#iu}W2t+9@?N{_?LVia}_gDJf
z%t)(UH^$)g2JDqI^WMyx(ZtiW4{nF2iPQCIJzs{VnXczP;M0fW9USR4^Ym<|>lysp
zrUe!t@VOmAUBQS4OmKoboa$Mnkzfnp%Nk$=*Ii-35}V>QL$G|duysVvwGr_}@X;QN
zzb#*xLug`bn~3#JXv6`G;^7;AE&~wgwSbHbCUllqT6ojk^fn7@G8kAOC{cA&PpGkA
z{vrjksIWl%1cF3Wh^z%HOfQhsbPxvUNnaXj!FhzJT(t9`u<8<tNtu-;hl`C~w^;C!
z7eyZOfo+Mf@F*|oxgjel2A6imRJLKjOp{A4Z88S}17#!ORifZo-m?J2yDxkt8c3TV
zXBAlF)D~glb}=kfcKrWnB}pbG>=uxeB1NlJg6OJ&WCJ_4HY=9R@&R@-Dy`JWT(}Y}
z<?E-5GqK-Nj|5{mqZWL_MMi>M)~UYe-dvm5>SI?)RnKr5*UL)^p({7-wKS<RS&P&V
zy$p4MPc>uR5`YBTRkts?bU_wQCE$G(R!lCIPpXUC)@5qv5Wq<zXrw3%#vJH`v45E;
zIc1h31o`|tj3eil4xnrSrwMdLWMeE?W*%U+GB~2A9cs*;D9{QBIig7cXr6Vk$D3_R
z=wM{coeClQ;KT^RAd2`dW&+0(W>l8}-av)j;a=0wbYokFW)A^@5Tb-cLYUO}zakTt
z3LK}XByp<+@%McUS78elMCHTD&FXYt0`Y&1B^P&0mKOb5D5lF%2+CXrEC;HKw0|zk
zfOG83^h%^(LaE~<gz@A{B!gUvi#`gMML%FUP?a`r&q4Znz#`KL0}5lpVM2kDzdLU4
z?%b{W{&fHNaR2lZDuj>e=;Yg~5?S!`auIZ8v$c?1EUIvMb%BZG!<l+l;m7ZXUnVMk
znQ=C00MZ`sug<S8F1;^s_I<5<HS-_*{LkCT<ml+@<lRJ`H(x%j+|B26UFFYz5@kz;

literal 1817
zcmb`IKX24P5XCPI#kEv$jhpm7=VB|QK*5R-MI@wzG*?ARibyyJ1m7#<>#W6o6@KrH
z_x=D%g->_h-I;ka@6GPsVqKrE>eHioSgeoQo}X?Q(_+0mT`?FJ>s39BbC!>>tvWg8
zaLQxG4|BrYbPB~)PgPa&9f$^;n1*$hz$8;AfN9l8n%0AZ3W5-u-cUJ_CxHprz~oof
zaH&GZl=7IE;}{Y0#WiAh^QksYa>i|W(le5eVKYvPb=UI}5^Ep=BTsRr;#Ra=A8F0S
zQ;}?jBoXkKNR$AxZ8y}V;$$Lsm6!yUVIxOk43%P8td(BvpcHoosl`r8xTu{RWbd%@
zxDKi91<$OQrjv~%&tl*fgi1&*?jUGmh!#UvA=_qcDxk<=U8&eKpvN1N8ASWcOdIK6
z2~0<XoX4r9elRl?BT=h2l<Bn-$!gEdga9ZS6`9DoRY~OqR^;0!hK)V?tnx}w_AxY3
z9e;ST+cHFtdzwe{3!fa1oVNNE2o|a3>8YgMFEfPSwtwP3HNVVuV+|*R3fy$=&)i#~
zrylROfbt_kXIL$B6FD=m>-to=!%-XZx4pOW%7;K=hB(3O@v+G87mH$`TJ3tY34~I$
zselsaCpcMM3_1fl@jJ26ddCtHMH*xuU1!kHAjQU|e^r`8lG`IC-a98yHwM>+vTNwU
z=*Gv`_m3Ug-bO=njg5fms+w~<q1~!aqyU}DhQsTN<>ZF~Tvj&OD-)1Wl>iN=*sR6r
ziw)h?4{kITN7C+l@4#tjRuH42%7iV=&FyV<Q+;{3`+R@*@QrGQx2jFI&f(QXqw=I%
zH_d!9mYd@d3hEza+2{t9!QDE))QwgTZvw0tzW%uXZW}&SKrvBIp1;04`_!M;H3I*y
ir>U21-8LsbU(99)2OnpzW`16Ncz01<zdwuF=Jz){+>Px3

diff --git a/art/themes/luciano_blocktronics/PRVMSGLIST.ANS b/art/themes/luciano_blocktronics/PRVMSGLIST.ANS
index 3969d72f9dbe35c22e07e76d0d0112303513722e..60a0107b9b0c0b606ce7f403c5352db52e9a4787 100644
GIT binary patch
literal 3429
zcmdT{!HN?>5Y6IE{D9Sf&Lw9jlbGP<6th7D1LESM<g{u)#ok4CqrbK6H{>s7pg+Wm
z?^RXzbS6P?83g-~bahp|s(Mw^lXRE4>n;bm%eu?HtIB%$%2!=zvwFc~0#j&eGweJ~
zvy7kmoz;%!A}Vnb)m=Nz%CZrn4tA@Z;VNtr1=S4-clLdCCdD369=YCPdaEdjlfdnS
z`*%f+-1!;}%qJ*^Eu5gtjmYwCr|xq7{!7zpvx$b-V&8ZCjw_%*6JUORy4XcY?1&J=
z8ZVq|0j<t=ku)^Ut(4p~n8kP*SnqVv?=GKU94EuVskAk#Nss<wyMKN-)orb2MQz~%
zrvcp}@_!1g7g)Roe2a`Up<A4g%<~C|S(hzBH?nRFjEXIiWKYxfm0y)DMrc3_b9&eJ
z-o7hZ31meWbp|O{VpXv<qAwiwB0|Q6L@I|PhxCTLmF%j6$P0Qx4R12&SOD*CUNNQV
zox;kwvQ<S5M?-P|lsKpF=UDG<&YEx%AJNB16HD`8Iy?{wPl}4BV`+P8FqfoQAQ*s|
zL)4N*qoo2Wo>>AyRlL7dFPtE6crqQ3M6#q_Gnl=`F;DnD2X^5uS6^2juEa^B?7Tu^
zGt$h22bLiTnnt=83X(>nZ<sLBgwK(c${#y+gjAveMiG@Wphk3L!eYj0W$#O`xneNr
zr6#7c#>>bUgi%Hq_>mSJdrI>DKc2r7ULNDKaK|*t-H`~`3r`=x)71(`<M^s=+zmBP
zURQumlMJlf+=Qf)3N)5b7N*|V3sYtVrM}oJ$;y)O!+Sd&nLt~5rd$WoG8te*9Xk&`
zjVdAM@czR`N=V?sUHmX6EX<yniM5~~<V+T}GLx}7SV?z@gEFqKo0%r_W1ZiEi$LZ_
zy6T^GvCV-E89<$wh?YP|D|AvhAe^*%&?FP}3hV+YJYY6R^OKp7Cn82DF!pWz*`BdK
zFeb1Xl@0XBAuuPzd7L)Ss*0vN$DaM%LO>=gr-r1PrK$fly!@A8;qJl7^v!IZ=d@{Q
h6?rkppXS3~_d1<}gIAryj;uQ`o-MM|=Tnv9=Wm*ffG+?5

literal 2280
zcmb_e%Wl*_5Zv5Qu3QK!fiF2To@{Kvo<b5KBqAXqBG8@!tOSTj1WDk^Cq?;&{R>-~
zU!khIXFT476Zl}y^rNP$y6xTR!p&!HzT-kQUDToPhAZ~5pDtX0z23)-L9h)0SVaa^
z74Q12EM+%kh(~hz&8q7Zu$?7$*U^fzcYHYgu{_1Xg=gG1Vf$zg3l=aV93p6MSx`I9
z|2t|E&aRLEhK(?s17#(9d73p`Tz&Yu9<^HKKrFGY1E2XyDDWhhU!Tu!qZDyONZSD~
zSw=w1v)f2|H0(yj1<D8E4PpD_sGcr%=QGb<>5lR>xf??~%<WF8VysN;vAOzJb41_o
zz!tMq&Pwt;M2thW=K2_{ld@U$oEEYglHl#*9ad3F2%ziR@7{Z?5hf!vXaaBp<d8L?
z?=jH`!@zrND%oN`^N<@4MBt7d@I=lPw)K40Sh)E37SP3)q7y%{1XfczmeOaB79edR
z9O-$Nx<mFwYH=FQYEcv}J(X3`AUhGATl0~~9Ti(jK`o_-q+|gE5Nt^hOC<)VY_kGH
z3F(Yh?uEYS4Z5l=xhWZucmEB{wD6S&un!l@Z_AIDk|amK%g$%9%UXmv3zw3_Lz$J4
zu$DY@EM}XqVfRL1aI3@QOp2m}K~UD9Sb84y88m<os8)+K)<(i0OeCSNTA(P~i53Tk
zuSAR|xchJbD1HiMqp&`Ff;g8;nA-dW(BViDM7>z)dSyw9o10YWn3=X!@??}vvNTM_
zqRhowl_d+S07JKS_Rt%fpmEoF{Ww5@Hbl0P<H0JR!Go<wk5vVQ_aU7BH2M~lrX!yZ
z<@Noxm$@K>7<p}(ipsCAlWIi_JTm^);Q|bLCS8(L00ESg+DkL>@lB%-DyDCSDiFlQ
z5D`%E1ZsQ+zY=l)Y67uRo5N$A1cSKsClfF}e82i)Z%?TZL-EB_O(L5VQLqRlKdmSO
z#x+xqk18YA0@<)3y)jG+daC?g(BJ(ie<<SS!{fcT`-jdE?>}AM)w{K;-S2yo$;QU(
U$<{=!`!Am#RVOd@beHdc07dif@&Et;

diff --git a/art/themes/luciano_blocktronics/STATUS.ANS b/art/themes/luciano_blocktronics/STATUS.ANS
index e16186216f19073d439b6c46cf759b65ebac5d3c..7784fdd8c03eb0d177ad3e048119b6d1d59f0b93 100644
GIT binary patch
delta 16
Xcmcbuep`LR24NOs151O+TZGjCIFkj*

delta 16
Xcmcbuep`LR24NN>15=~PTZGjCIDG}i

diff --git a/art/themes/luciano_blocktronics/SYSSTAT.ANS b/art/themes/luciano_blocktronics/SYSSTAT.ANS
index a76e3bd654c45d46566905990ca88b74c0b5e868..eaad1e7cb18786acea3b27cca7641ef32e39acad 100644
GIT binary patch
literal 3490
zcmb7G!EVz)6fEL~#2wMgUUIjSkN`P_QXvivm0~KPo}x4omFfny0f}$oRDQ<>{|RDd
z-do#=165r$Ua#N2nKy5Clf&~Q5C6Rm&j<ayEO8rKq)jx>T-};`qA@4`U^<-)M)~~H
zJUc!K^K6>U56_bc5{5tR1h%}w8vOe$gtFwY3{}-acdX+Xa_5(x?cK?gk3VAaZ>yWz
z%k{M&8a`q(&U<fWDFXMEEgo$&BL)hjhK~}%HW^<~R)PwlcQ)%kLF~Ruv3DMb0AE{h
z?LZ2rlOYC0Q7DMFVUqK6tk-w|Ha=YL;IK`F`(Pm;0=WdaDFHEni8c(F932{K4#1^>
zk<loxR1{x{&}c#$!pG}=UYHL5sy5a~c!3O*sli2Fdx5MK{!}h3X5dP0*rrE>hX`0E
z53wJtxO8`JQ4z<sZK=Q>BeR{5z}TVuU0IBplcPK)hiSnFrkxC-2L=+7NlaLKjR(Vq
zk5!%TBcBXi9mTYe>1t<1!@z-@t0_mu$ktMHFKY?u`k|*0AIYq*UHvNCg1!?$zX1jZ
zNmZF9_GX+{p#lu&#?-(R;8<>oLP3(ED%==o3X`=D7wako&9_K#-Y!XGgn(J<hya+&
z)z}Fm@0m;-3Dlip?`S{-VPo;YQC;Aq{mz|(oll!}+vHUICTVCeIbVLll9rwNIi#^E
zgrNXzF)e~>fY+0ANo?~eOwBQWfuc?e*i38aEEAr%0@lVr9c-$M7)hF7_e!c3Ls1=b
z>>h{$7R+%6iU|c!+c8$o2x^t|6I>~UB|6w?4L_6o=TF>pfKX_pai(0w4r(gLQN|qd
z0x%E><J1>-Pdv9(54vlpkQ*fMn)sF<Y$FQp+%FW}49WH*UL;1+6z^@$soOiH06k~R
z{90zwu?NmMMxiHL+uRsJLpaJW*}#jnf{I{;BBrUab`})j3C<!&+>mewOPf<|*ez;P
zD?sm|2i*(7^(K~zEL4N-L0=GH+PJmY1vrWj@ryrN$vsDtVz&n*NOo$uYeJh*6wzBo
zQ|%$;))?i#ocnJeU@Z2(H5Z#lrc#RsE98+%4PG<yOm|(XBI?O67MqnvhSx}!<h{4q
zizZ7`_I@$V8g!p0gz6aL3s;_jibj@O7(HND6sTQJjpeSza&!4@6|UD8tJ@tm)7e;T
zd>TI`pnJ_vt2dYVZVgA-sE*;lSJO|@l!DtA0R2JLwNGS~Rxu{Ac&iLcg%!)MH#e*6
zjTpz|F5m3!%ZA?;iS36-35Tt|Av<NQYbio(&4>A5J4xqBf-DzTSGQrazF2&B6l9=q
zp_gT8YUfQnQ;@<%S==l??-cW4nkF5LtqJSEdb79+g6#kvz4{m4^2^sInk4ex{Ajq9
zz55`%FYDV)U7&WVC-N#!v$WqvZ9ASO+o^JPmfi!~s?xA`GGwQzI^#4Nm-<8zG}SHV
zp)(P{cQu#$RD~b1y!b2Vp;_^bU+O0ezIoV(=kw{uqvPbB);|cPpY#XGt7Q1{>A}IH
WN2dqR4s<<!|K=o|y_?!o{rMNC*$VXl

literal 3066
zcmb_eO>f&q6m+icv8Ps-z39#*Wy+~eiedykSTP{gK;e^M3#b9p3T!1n|3?2tPtM;V
z8~&3ZGxOdqRW--bFu!*9&AfT@mKxm@vq>?lrp@T4Di%1EP1oVV7ia$LkFWjlG~oCe
zMmKR*)y?Yn)%xNxtk(1OYJ_MA5Wf0~sjuj<0RMgoq3d|tg}zTvwap9{ON4FiJ<z+$
zIUoN{aX)RJp6_>$ARqu<Vl#fTjF<qv(HZ8bDFGmn0Ztumk1%_%v2Zwpyza->%kosu
z2uodJg9sQSj>EiYW|pb%TE?lQUz|;F)3&YV@G>bHo~Ihd16bfhG$<aro~nAlc<ySX
zJbe;oaS8&1j{pD&#VbbU3)Zm%YG+8KQ#U;>HY6HT7R|sFw(Xeb6zS>lzZ?!ndlU^b
z3`?*H9_ea;40`+-RuhZ^@Dc@SGD$2T1eVD)tPVBqI%fo&(hY?5a-`ej*r6<G=7ii6
zsicV!a!S+&)J-B0Q(;OvS7TI>L6WNeKxIm(2?za~4MZ^sK_VLAR)%w5Wrx6ge3h9d
zqKJGT-*?HHY9<!AI~QDHLvXp@#iE~0N12`$ONaoMG`(q{5hUA(9`Q{O8}WNtCkX>R
z+P<~&)3XeAut^wX5~9px#1Rsy*Vz=N-e3{jc|}Aa!MR^B1g{tzyN0<b3w8}VnoWV;
zrgd@|N;W=rC(Myw8B1L=7=xumqoh!%C^|)ppa($p#BNoZ6oS#DH%84VP=r&#Piycv
zsAIq~w)U53E*jl<Z}-PasZJ<`_9q&YsuUzCJo2z+IZOtf96GuI6_#+)QqIjBKYu1i
za;JVw$Aw`sD2#1Ah*4p<?T3RtXN6PKL1O{c5>tF~WuT@9#uds-ZDs*f%ojXxYbge@
z_RiU+Dsbsx9NVZc`#@nuAJCw9ZbyD?01eGx3_q~DVMb_!C58dZDOT2~+)#~9<;W;J
z%RI|6b2m^L!vx2H_Db5FV@Uykd0Pi@qjD9@A`;AMjJSy7P6cUpVQ8K1i(KyCoWpOA
zK1MXJ6@%FVO43SsC*gIjn}3|^7sSTBCVo+VsVwk@slu&|Hb8J{hC4CLvc5Pwa1%S0
z^KP@>IzspbONwUvc7297?0+l9_cgNG(veOIV&ayy;446@Qaw9NahR_;SEHm?H=Eo2
z{ikhs+}&-TeO{t5Urue~)#?}DB=za8oBe%rOnb4e5rMXF4<%kCkXcerwUX@*1AWuZ
zmQn^+ux@TYK0R$8_u>fBn&C<<-=1?9V1L;{Y-QNgPUQgx@h?Z+>~eM?<@bJ7VXeM5
z0NFe|Jcs@6Zu6(d!aUI!uh%gGMF3v7A@1hs_Kzb{@8_{VVEq<^P`mx+At-!~kpeGX
zAI7CCgs8&Ye)u@d*Zc8mF&W~954-1mW{hfM4(ge?8277nERD11TM-Xlv;n`tsI?Z;
z1vvn2;Kk*2JOH(14Ebo{`YKioV>mFn#m%qKJ$!@BFjtGsdNixYFE1Yagqs@N{!)4I
zrRwyd#V&jL^J@Ov;-V;+&Hr?iMLdtOJp1d1lap7ku1<bB(edN2Z!W|2ySY8(^Ea}{
B^SS^4

diff --git a/art/themes/luciano_blocktronics/ULDETAIL.ANS b/art/themes/luciano_blocktronics/ULDETAIL.ANS
index ab3ea881edeaab12b66f5a36b6b78dcc50bb8272..4454fd174e521d04a5c901f29e0152a06fdc44aa 100644
GIT binary patch
literal 3339
zcmcIn&2HL25GLv^>H}2evKOTGP{}a})N&#Xsv?0JDWn%pQA;aSZ5lyx=;QPaqP&hR
z?VD8n=4aPygNaM&9x%Hz^Ue3ojBRMo6WgA56KmS@6Pstna=FXfu$p4QWe8VT3O9Un
z<Z29k%GDHs8p0+HV$*SvGRrDSigbH@(}V(xJj~c+nSsD$*iG$ke+CYHdv!7SI65<D
z<JstZatR;kdqbDhc4m{4WFK;M6!yWYuR&cF723C77VFQe<?Y?_$Bmc#t`P+;%-!|3
z^^;-SInWSLqRw=70uQ~GCaGSQ>5OM7NAY!AR9)6a;&x;%n`*M`m4qw$b8)>=P*dB8
za@I1VM!U{*+yw}VPS>Z)*9f$!(?7FUfLH!zU4LKRn&nq>f3v<{E!1jW$HMeb9#-Lo
zcd<)T`aAq;vS88=wwQ7dkQL9+zsSIY);XQ^nD1cN>s#6F7=%jYHlCdSr;`3XAkXLg
zz;6M}4+B@S9C#|qL!oWr7UVfi2HR7M@4Usnms+YX+5%=hY6_}5#Cr%^5KgIK@MRlu
zClftRX&T6G1y(}vPBTFEme4005Z<<yD<^t~lfy9~2;nF{vJXHLOL!0+I^dn70NSdJ
zq$yEl!WuLr66-^pcL#z<W{XILEu1L<u1(M)cCHC{BeLKhd`Ofm_D+~O#Oe+vB^)zg
zy+oIZsD-=aiE|wKgCSD=eXRoh-U%fEIGg~$H4|8Dz)p{3BW^U1)Z>h*QYiQS(r0gx
zp#dFU3WGQrpPI>5$(38YD1ehi2i5Fe?&G6p!-4{PX_$`-W$|MIKVllk;=8y}r&Kt`
zsggUc|FBd;sfOVR1lxgi)UNmkD!>$OOVdM2bPK`ki?j00M}6S?l5jxx;lX!kL#a2Q
z^bwqtk#+hC0R~`Xi2I}`eo!K`2txGx!U>>a(QOvS$IC{^`NkG;#V04*Ruc{sTxx}j
z#BgaGPOE2mPOclrjyh9908@H?MfHJ$QjvcIj{k9x4EyqOboG9mBm{k+l_qI7d7Jcp
ZJ#V#+jxJg+TD+c}pH9uE4<p%y&p&`WODF&U

literal 1941
zcmb_dO>5gg5Oq!kUwdkG*^8k)1f-QLIrYg=ObIwN5T_TNLhBY&l!iDt^k0Si9SQcI
zl)g8!D=D#$)j|6;^Jd<g(JHFqc^1#pxHeIh)NRv0u5~T;k`j}C7c<8bWBAt5z;0T~
zQViR11lWMtG*MM#Wz&pJ(;$k3N^SiY;NB?B>+8$am&KVmTdo)9t1Fnn{g{KTC+k%b
z(=V!QTzW6eXC5=EvKh9O0ugaG4e=Oo4*c(%-M9Pg-NW|xZHW7cLDUgeAs4ZJxcRvY
zTQEadrcbtvGr3qNIQ63hOsD%m^<=rWVke{6C7Lvq%?`Q1{G_K?Xjs_h`|xD-XLEDE
zmuIiXkQTCCrkXX!K{osLU@W0g)};KP654wAYkOz5Kg{Fp?(u#T!hVdZ8CnGDpv+U9
zd7Yvv&w4T^r9%ghxKxYjPfphvak6}#7JjAOh+Re1wi%n2U4$mXOarmWih}VlQXK-e
zEkY}6i-nOT)|su@h8ZmIMyDtzS!#GOmor!h7OTy4(HJ-sSdGzO4&-pc-iMwAp`|||
zE%g|91dhN#hyuCb(O^uD8?tiDi%WmT`~$N?7%)>t!Nmo0Ab?lF)G<{)IP3O&0znT-
zsND@7;0Hdc4V48SR-w~uh%HQ*y@Zexsx@FCen=Bl^UQM3kJm;=79n8-08v9>v5=2i
zwsfIpz|wf++j9!`TBbvSd7ULEG6WF%Oeku}I$$RcIlsmagr1*6yqEc@*nM<QJd_wt
zUA@UhOQ-q_8WXMXDt521uj@<gTO-|rZY^rZLh#DyN(U^>3!3L8USNff&el{=J_v?G
z1)iRQ1OuCprltTw#O@FRwD?QXYyr~dRg9Zh-7$3j17A^tCL)0*DIh+-;N|sTe=_}^
z-Qe?gRLvnW?jcNN(ze{xxuZs6ke4{@Zd(0yIr;m!@%yXAb-9dVy8Wle#z_&|#2&vH
YjgF2kNAE`Rygfg?Fke3}bk)880h4Hf$^ZZW

diff --git a/art/themes/luciano_blocktronics/USERLST.ANS b/art/themes/luciano_blocktronics/USERLST.ANS
index 8c67ea58e8305ba470bf187c5a1421597450a665..e1563dc489f540da3224446e4e5abae768885347 100644
GIT binary patch
literal 3164
zcmcgu!EVz)5KYCc{6HZR_`(_2sTx5}rHW7`DiuO|$tkK@DN>dQlJZ?uf5(>gANT;o
zn>VwYwQ;Hjk@#R|cV^zqdoy0AJI>vHR=>LA-m$By3cKC$;h<Mwk#ULjQQ^uG4|w37
zJMqZ}5}>{Vu~g!i%N9)@P^H<O!fHq<iK}RVJMeG;iou~YLgz@F1}FKDtq&_M%`53;
zgDWq1vNW4eX{p&l5^^EL2X`Qd90LVYYOuvUD}Y)UlPIBR0AYd2Cw$1W2bCmc?1EAC
zl`q@Uk|YB}b1R6g2-Ol6P4JO4{iIb8I_dy$IEf|*jHu#eTX+Zux&e!9OOawlS6v>{
z(psQY!5O^(0!Wu2xMFRj(O$?Db9r78&`cRPK0JgH$Rd`ktqE~a3#-PI5$=&Leyf{u
zw%#^#s|W!%6^<5^ZxMaR_OZKJmG)QJK!A*cpo!2JOa@qySp8)Z$=L~kMv?dTL7-4a
z<QEJen82xcbkb~uF;&qLX@g}J*EkaiS^}Zt668`q!;)8D&^Vc7f;fnzlTXT$YoB!^
zXN4ia<l&jT)?P-$Ck(&^u-I+xRh*{3w!Ji=hJf+}VkL?dfDuG$FDFw{mA;J>WbF-5
zh5JpIW0zfyhF`KzXQQv=UbqaFsQ)7vP)E+RMs}&T@9q{iKkx(S=|$7z_I5g3NK|U#
z;JMlSda|6(zcsBW)y*c0Wp+K8%@U(2(N+Z8_~z>T@F`^Km8@H}XY<s5UCieD?OC4E
z)=hG?XW0@Lg^e%Hj<O_kvWYV5d`&SqA;Ncko$H4C0lEGn%gNAuM>YhmxrZ#Q-xl&o
zP0o(wFs+6D^TN_-7CmP1hha;^c9O-8n!shdujOvD@N0$-8a^vJ7mc>FnT0!e@#;0s
z)ZD#Cc{pVY=jK0e^!y%<PHB3Jd*MFU-M-&Vm)Hq^6aspf5q{3J1`f!}(aGiMFwcYE
je|Q#o(aYcEN57tTI(vH;or4aqXJ;SIv#XCMx{CKduOcIh

literal 2047
zcmb_d%We}f6iru1vt>hx1m3V_9%%;1s#FoGL?s}!o2;U$l_JGNkd$BHH>&>5Sn{7#
zoO7=|<4GD;jH=1_`o7M&$L?^RPe%Eqs%<u$7bj=Kc{R4qIb#ggld8nR$P(*OX`2Q=
z@W4B_^g*mFi^*sl++`0QvgMJg!9sIMS`BINjm&We?shn51BG?yg{v`FlPX75ZD_9;
zO4ZoKqea;y4YKm=kIS$}98WYHLK0*##7B2z0KS^|@Ts`4*V;k@LIfMHweivtJt##&
z`Gtcp07$NBc2Rogo2M!YKDH-?r5Da6!6r#D7T?;&0k!G5VOuxIkv=eCkQ#^7VXB%-
z>yd>HY4rccC}J8S2V#tYUzj2Q2Fx;NnXEJ5C_?l4(0{jLg!u3fJLm>Ye;ta%i4Fr5
zQ3^ePy1-i*ON6YwrnNiH!~9#`lmR0ugGy^F)05E}7l#{^0Psd6plxC(@K=HNj}OU~
z84wftyT6az>_LkgK-wll=MjA*1WANWN(Qd&DGOo_EGkUwCmCdm!xWk{pQP&7;6Y{_
zRjzUuv>8b7P<eyj<n(${>|@X2!l7};<U}{SR!_RSa9$ALFAbIZ0zyMk-?+@kxdGKx
zPT$f#N~_@HayI>DKA+FN3y-BW*byG9qPun&4{)&GZEk+y1AzjUG`^>wUEJO-R~sd^
z7>Q}MzFusX>mR{bs&TQ|n(M`CrPfXuO(-G+zqz_7(mv3!)~7M;%R@tQ)ksObBs;Wq
z&${pH!OQ_`NZX#!cx3CgJcBuyetD09<1gCVc$dkUSBc=>iw<pvNXJ}<9l}i+9pXfL
z7}E^Vp%Qr<ATSLOnL?>h4ev|hl7EHJQfXftzj_VwbNc}eU`D02>)$sbc{`n9B-nb3
zcWJ-&-G1IJx3KV>t1dVslt48t=(Crz)627Io>No*=_&K#q{xeRf1V8nM@L@<#{+qu
PpMShCSD#LG)xQ4%WXzk*

diff --git a/art/themes/luciano_blocktronics/WHOSON.ANS b/art/themes/luciano_blocktronics/WHOSON.ANS
index 53575482178fba0aa4d84c25e46d730044adb013..1dd7f6778821eac8a13479b2455a43fecfdfa2a7 100644
GIT binary patch
literal 2363
zcmcguO;5r=5H0ay`~}8ddNE!XN+5<48lohECPX~+L=+;43kOO3ot}5&{uASy+3i9r
z#fA@;r0vYkyf<In5+*`MC6-oUQf<|nQtL3O3yG_cCnX%oEf(Zy!X$>j(FRz6z;!c(
zbp<09nBW9=IJM%MjRY!yH(LNBaI0k&h)}Xqj9_VPU|SMJkx__GfsgDVd>MMA9Hdst
zXa%_x8sPxO;^B^8<N*k%C?LlM6LRKQ47|zQ)!SJ>Nx{GZL2*@4Pq)WGYKj!Kqw4V!
z3sysWUYU7<?Q+Aqai~C+C<O|EG-wgM`>|}5Hr1uVKXJ6y$?FVioq|(|QK6MQUAoyD
zHCleBX+mnqr`!9BL3H20>-IYwAT<wDLS`7btbbl|NclKW*?lczXD<y|DViw6HJiVT
zZMatcc%5e{N0Z6)?LDI#Jujy7+3y-ra~4xMj{N5Oyy)HYbCf~ePH-%1Q$!0I@_g8<
zmgqt`_VqdaJu~IdQ>y}&!%c*(UP{0Fy{IXNX+5F(V<$HV`_2q6iam<6r29=QCCTNY
zSC8P`n^eH^Ps4neV<2~k;v>fk-~5Qrz-_9Qb{zj3@SS5sZp7K3{dnCGVjIi?pPHz}
c;!@N<kAt96c?eDeUPs-lUNpRETghL40C<gAga7~l

literal 1162
zcmb_bO-lnY5N*NJUOnkvf*@X#?RHn$Q!PaW+X}^c*i+FK3&tK4{IMI%KM~)|WYbC!
zFQ!<NnK$pvSJPToxvqMpP3vAUbWK{DDle^bX`O59lC;+3>JP<H^|bYP1L2(q8lWbC
zvXVhSI66uxxB&zOD63uuJ51nbLC^#%^U+gV4r&=%-fV|gDc?Z20X?OL$ET;Oq0C&<
zc-P<!`MqEYLzIN$KRznrDK12qi&hRsg0q+hUV0I$goUKwh9t-n)^#L~LaBbf@k1=+
zi^d-}V7CqlLpo?PN<(4DlMV@n55L7IwQLRX#`#H5w0ZO{LETbIc8*#xn6J=4QY-Ak
z_4I6}rjy&7$%y5t)igiAWK(o(5s~o#XidsEDep*x27`dt&C^nN<o)ryp$ku&s421~
z6ogu=R_m9y;51BY7mx4j&8y%|P676PZI?=HaS5QCU~GYxalExLBa~9u)A`thYKkI?
zb8Oq3GRAVteyP&aep3YzEw%4ikrYzkzu=3y?Xs4!4Fq%T!u`R#JJ4+w+yyKr9sE{R
zNV6YDL_c6`E<=2BJR95(M_OZR|LbJh^o_~#lY>sD+r8@?b@&|KT#nWJY9O!p{S9;N
By?X!v

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 582432ecf..db01b74b3 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -187,7 +187,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 15,
+						height: 14
 						width: 50
 						itemFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{location:<19.19}|03{lastLoginTs}"
 						focusItemFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{location:<19.19}{lastLoginTs}"
@@ -416,7 +416,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 12
 						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts} {newIndicator}"
@@ -618,7 +618,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 16
+						height: 12
 						width: 71
 						itemFormat:      "|00|15  {msgNum:<4.4} |03{subject:<34.33} {fromUserName:<19.18} |03{ts:<12.12}"
 						focusItemFormat: "|00|19> |15{msgNum:<4.4} {subject:<34.33} {fromUserName:<19.18} {ts:<12.12}"
@@ -783,7 +783,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 12
 						width: 70
 						itemFormat: "|00|15  {msgNum:<5.5}|03{subject:<28.27} |15{fromUserName:<20.20} {ts}"
 						focusItemFormat: "|00|19> |15{msgNum:<5.5}{subject:<28.27} {fromUserName:<20.20} {ts}"
@@ -1214,7 +1214,7 @@
 				2: {
 					mci: {
 						MT1: {
-							height: 14
+							height: 13
 							width: 45
 						}
 
diff --git a/art/themes/luciano_blocktronics/wfc.ans b/art/themes/luciano_blocktronics/wfc.ans
index 9bf19ca21893a2f8ab6ede54d203ee743f2109c8..823e0d4a3abb1d628487ad33a64b4aa5f39acc46 100644
GIT binary patch
delta 232
zcmX>ku}flu7xU!X%r2AD7)2&0FtSdb%WOBfjm2fMB1`t<1B@no($R+2#zwiSVSdul
z2Dy_rvWQRiXA++Lfr*Ec3oK`lt1x*gtHb0BM#0H3td^7Y*#akDVHM&9DOUgikgCaV
zS)C{QbFxnEXJ?(n9yGa&t!(mjcGt-bY+RFr*sCV{aBEDyz`;6Mk|UHwH6qevaw4Y|
z&<=K<`wI8r22IZ8kOQh>-+Y(Didoy(z|z3v0yhH#BVz!A1Opf_dph|lgt<FHcyJN`
D1Zg~V

delta 237
zcmdlbaY$l=7xUyk7OTnrOgxjAI3_1BvQA#kY&Y49*=4diOYY>?%yz<t*2YG;s$qT#
zFd!X0`5=?*Bvw&`PWH)Ztd^5SSsf(q+?I|uv^Fu%y>mx8+QcCD4p<jZ3qPCl<OQq&
zlb5hHOpaj-nq16Y1=P<rS)Sc%vMfi?WLs{1xtr3_1|Zv@dVn??<la}f53%^bL`Tud
v=Q!9|R3joyHecqjVb(S>urM&W$<4sP$QZyN$p8jSo=(0BVeXC)9-IUKh7CN5

diff --git a/art/themes/luciano_blocktronics/wfchelp.ans b/art/themes/luciano_blocktronics/wfchelp.ans
index 24ab3bb90b62434268e6de7e1679fda6d3a398fc..5f261f87a1fa0efd7a5ae3294577ef33a0ed4f52 100644
GIT binary patch
delta 55
vcmcb|a)D*TdB(|i8N;-V4J-{zZZa}3Ffs-(a5I1bv!|1<LYTWFga;=9dqfF2

delta 70
zcmcb>a*t)hc}6}i6fpTbW0<y)ftjK4S4IW~M#caJNd_=r@^tc52y=IY@Zcl>&#MXQ

diff --git a/art/themes/luciano_blocktronics/wfckicknodeprompt.ans b/art/themes/luciano_blocktronics/wfckicknodeprompt.ans
index a11d90eb3882c3a767424962034046dd07e0948b..50f1c8ebed78cb3302bf7894828479971d71d611 100644
GIT binary patch
literal 193
zcmb1+HprEZHncW2$hEUmkd8L6Ha5%6&P>i$$jeVjh053i#dCp@Kq=J_UqhfMls3qf
u3U&;2b~P|ipdK(XFful<G%#^sU|?Wm3}9dc(m=rM>Ex>r=I#jL!ASr+kRVY2

delta 7
OcmX@e=s3ZFkqZC`r2*dn


From 06c3d100d7354cf56775472352472f77c609c001 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Tue, 5 Sep 2023 20:41:40 +0000
Subject: [PATCH 04/17] Updated length for message list

---
 art/themes/luciano_blocktronics/theme.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index db01b74b3..fde3659cf 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -343,7 +343,7 @@
 				}
 				mci: {
 					VM1: {
-						height: 14
+						height: 13
 						width: 70
 						itemFormat: "|00|15{msgNum:>4}  |03{subject:<28.27} |11{fromUserName:<20.20} |03{ts:<15.16} |15{newIndicator}"
 						focusItemFormat: "|00|19|15{msgNum:>4}  {subject:<28.27} {fromUserName:<20.20} {ts:<15.16} {newIndicator}"

From 6748b8966e113c62d627c37f8c336eef6cf71104 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Tue, 19 Sep 2023 13:14:24 -0500
Subject: [PATCH 05/17] fixed incorrect reporting of cursor position

---
 core/fse.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/fse.js b/core/fse.js
index 6d883ba80..e6e7a9d18 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -1050,7 +1050,7 @@ exports.FullScreenEditorModule =
                     posView.setText(
                         _.padStart(String(pos.row + 1), 2, '0') +
                             ',' +
-                            _.padEnd(String(pos.col + 1), 2, '0')
+                            _.padStart(String(pos.col + 1), 2, '0')
                     );
                     this.client.term.rawWrite(ansi.restorePos());
                 }

From d3cf82b5635554b6a7e678c7ecd7ab1d10899a57 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:24:32 +0000
Subject: [PATCH 06/17] Bump systeminformation from 5.12.3 to 5.21.7

Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 5.12.3 to 5.21.7.
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/compare/v5.12.3...v5.21.7)

---
updated-dependencies:
- dependency-name: systeminformation
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4cf93bc20..fbf0a977a 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "sqlite3": "5.1.6",
         "sqlite3-trans": "1.3.0",
         "ssh2": "1.11.0",
-        "systeminformation": "5.12.3",
+        "systeminformation": "5.21.7",
         "telnet-socket": "0.2.4",
         "temptmp": "^1.1.0",
         "uuid": "8.3.2",
diff --git a/yarn.lock b/yarn.lock
index 94ed993e8..5a208495c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2178,10 +2178,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-systeminformation@5.12.3:
-  version "5.12.3"
-  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.3.tgz"
-  integrity sha512-aPyTDzK/VjEheGEODprxFTMahIWTHGyWXxTsh9EOHjeekVltrIWrle4dOZouOlOYgtKM1pDoHkrR+IssgYCK/A==
+systeminformation@5.21.7:
+  version "5.21.7"
+  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.21.7.tgz#53ef75daaf5d756d015f4bb02e059126ccac74f2"
+  integrity sha512-K3LjnajrazTLTD61+87DFg8IXFk5ljx6nSBqB8pQLtC1UPivAjDtTYGPZ8jaBFxcesPaCOkvLRtBq+RFscrsLw==
 
 tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
   version "6.1.11"

From 5180447e87f5da53191f74f109036890f66a88d8 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Fri, 22 Sep 2023 10:33:42 -0500
Subject: [PATCH 07/17] Added code to clear the text

---
 core/text_view.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/text_view.js b/core/text_view.js
index 74b622ba1..772621dbd 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -179,6 +179,10 @@ TextView.prototype.setText = function (text, redraw) {
 };
 
 TextView.prototype.clearText = function () {
+    if (this.text) {
+        this.setText(' '.repeat(this.text.length));
+    }
+
     this.setText('');
 };
 

From 75fa2026c07173deadd03f5c825693594de1d0b0 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Fri, 22 Sep 2023 10:33:42 -0500
Subject: [PATCH 08/17] Added code to clear the text

---
 core/text_view.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/text_view.js b/core/text_view.js
index 74b622ba1..2cb19040f 100644
--- a/core/text_view.js
+++ b/core/text_view.js
@@ -179,6 +179,10 @@ TextView.prototype.setText = function (text, redraw) {
 };
 
 TextView.prototype.clearText = function () {
+    if (this.text) {
+        this.setText(this.fillChar.repeat(this.text.length));
+    }
+
     this.setText('');
 };
 

From a6196c38ec9ebc23f86b92ae670bda1f94e3ec89 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Mon, 25 Sep 2023 20:25:01 -0500
Subject: [PATCH 09/17] Disallow posting empty message

---
 core/fse.js               |  7 +++++
 core/message.js           |  5 ++++
 core/msg_area_post_fse.js | 59 ++++++++++++++++++++++++++++++++-------
 3 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/core/fse.js b/core/fse.js
index e6e7a9d18..be3be90bf 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -183,6 +183,13 @@ exports.FullScreenEditorModule =
                     return cb(null);
                 },
                 editModeEscPressed: function (formData, extraArgs, cb) {
+                    const errMsgView = self.viewControllers.header.getView(
+                        MciViewIds.header.errorMsg
+                    );
+                    if (errMsgView) {
+                        errMsgView.clearText();
+                    }
+
                     self.footerMode =
                         'editor' === self.footerMode ? 'editorMenu' : 'editor';
 
diff --git a/core/message.js b/core/message.js
index 6a0638024..b9f84abd8 100644
--- a/core/message.js
+++ b/core/message.js
@@ -763,6 +763,11 @@ module.exports = class Message {
     }
 
     persist(cb) {
+        const containsNonWhitespaceCharacterRegEx = /\S/;
+        if (!containsNonWhitespaceCharacterRegEx.test(this.message)) {
+            return cb(Errors.Invalid('Empty message'));
+        }
+
         if (!this.isValid()) {
             return cb(Errors.Invalid('Cannot persist invalid message!'));
         }
diff --git a/core/msg_area_post_fse.js b/core/msg_area_post_fse.js
index 9eacd1f54..91e8f6d3a 100644
--- a/core/msg_area_post_fse.js
+++ b/core/msg_area_post_fse.js
@@ -14,6 +14,39 @@ exports.moduleInfo = {
     author: 'NuSkooler',
 };
 
+const MciViewIds = {
+    header: {
+        from: 1,
+        to: 2,
+        subject: 3,
+        errorMsg: 4,
+        modTimestamp: 5,
+        msgNum: 6,
+        msgTotal: 7,
+
+        customRangeStart: 10, //  10+ = customs
+    },
+
+    body: {
+        message: 1,
+    },
+
+    //  :TODO: quote builder MCIs - remove all magic #'s
+
+    //  :TODO: consolidate all footer MCI's - remove all magic #'s
+    ViewModeFooter: {
+        MsgNum: 6,
+        MsgTotal: 7,
+        //  :TODO: Just use custom ranges
+    },
+
+    quoteBuilder: {
+        quotedMsg: 1,
+        //  2 NYI
+        quoteLines: 3,
+    },
+};
+
 exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
     constructor(options) {
         super(options);
@@ -42,19 +75,25 @@ exports.getModule = class AreaPostFSEModule extends FullScreenEditorModule {
                 ],
                 function complete(err) {
                     if (err) {
-                        //  :TODO:... sooooo now what?
-                    } else {
-                        //  note: not logging 'from' here as it's part of client.log.xxxx()
-                        self.client.log.info(
-                            {
-                                to: msg.toUserName,
-                                subject: msg.subject,
-                                uuid: msg.messageUuid,
-                            },
-                            `User "${self.client.user.username}" posted message to "${msg.toUserName}" (${msg.areaTag})`
+                        const errMsgView = self.viewControllers.header.getView(
+                            MciViewIds.header.errorMsg
                         );
+                        if (errMsgView) {
+                            errMsgView.setText(err.message);
+                        }
+                        return cb(err);
                     }
 
+                    //  note: not logging 'from' here as it's part of client.log.xxxx()
+                    self.client.log.info(
+                        {
+                            to: msg.toUserName,
+                            subject: msg.subject,
+                            uuid: msg.messageUuid,
+                        },
+                        `User "${self.client.user.username}" posted message to "${msg.toUserName}" (${msg.areaTag})`
+                    );
+
                     return self.nextMenu(cb);
                 }
             );

From 0e09ce491cd4f2585a1c06fb6524802999bd5324 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Tue, 26 Sep 2023 08:43:23 -0500
Subject: [PATCH 10/17] Removed extraneous space from config template

---
 misc/menu_templates/private_mail.in.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/misc/menu_templates/private_mail.in.hjson b/misc/menu_templates/private_mail.in.hjson
index e27314dca..2914a11a9 100644
--- a/misc/menu_templates/private_mail.in.hjson
+++ b/misc/menu_templates/private_mail.in.hjson
@@ -69,7 +69,7 @@
                             }
                         ]
                     }
-                    actionKeys: @reference: common.escToPrev
+                    actionKeys: @reference:common.escToPrev
                 }
                 1: {
                     mci: {

From 1d31b268aaf0c1f97d5055c074edcfe484c02fbd Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Tue, 26 Sep 2023 14:00:05 +0000
Subject: [PATCH 11/17] Fixed door logic per issue #506

---
 core/door.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/door.js b/core/door.js
index 313adf74e..68f0ad9a4 100644
--- a/core/door.js
+++ b/core/door.js
@@ -57,8 +57,10 @@ module.exports = class Door {
     run(exeInfo, cb) {
         this.encoding = (exeInfo.encoding || 'cp437').toLowerCase();
 
-        if ('socket' === this.io && !this.sockServer) {
-            return cb(Errors.UnexpectedState('Socket server is not running'));
+        if ('socket' === this.io) {
+            if(!this.sockServer) {
+                return cb(Errors.UnexpectedState('Socket server is not running'));
+            }
         } else if ('stdio' !== this.io) {
             return cb(Errors.Invalid(`"${this.io}" is not a valid io type!`));
         }

From 2b6494cfc9f69e89d41eb3549e62ec5d903dbb9e Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Tue, 26 Sep 2023 16:14:10 -0500
Subject: [PATCH 12/17] Added checks for undefined

---
 core/ftn_address.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ftn_address.js b/core/ftn_address.js
index 36ed34004..ec383c7e3 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -135,7 +135,7 @@ module.exports = class Address {
     static fromString(addrStr) {
         const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-        if (m) {
+        if (m && m[2] && m[3]) {
             //  start with a 2D
             let addr = {
                 net: parseInt(m[2]),

From d12b0789aa0ba2b3fea7467d9a7d9bb754f2c503 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Tue, 26 Sep 2023 16:14:10 -0500
Subject: [PATCH 13/17] Added checks for undefined

---
 core/ftn_address.js          | 2 +-
 core/system_view_validate.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ftn_address.js b/core/ftn_address.js
index 36ed34004..ec383c7e3 100644
--- a/core/ftn_address.js
+++ b/core/ftn_address.js
@@ -135,7 +135,7 @@ module.exports = class Address {
     static fromString(addrStr) {
         const m = FTN_ADDRESS_REGEXP.exec(addrStr);
 
-        if (m) {
+        if (m && m[2] && m[3]) {
             //  start with a 2D
             let addr = {
                 net: parseInt(m[2]),
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 61c52a521..4c5521d18 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -91,7 +91,7 @@ function validateGeneralMailAddressedTo(data, cb) {
     //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
-    if (Message.AddressFlavor.FTN === addressedToInfo.flavor) {
+    if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
         return cb(null);
     }
 

From 0161c22401812d712ecfbae725b06022c54e2057 Mon Sep 17 00:00:00 2001
From: anthony <e69975@bswhealth.org>
Date: Thu, 28 Sep 2023 11:05:10 -0500
Subject: [PATCH 14/17] clear prior message; msg tweak for empty field

---
 core/fse.js                  | 1 +
 core/system_view_validate.js | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/fse.js b/core/fse.js
index e6e7a9d18..b956f9646 100644
--- a/core/fse.js
+++ b/core/fse.js
@@ -167,6 +167,7 @@ exports.FullScreenEditorModule =
                     var newFocusViewId;
                     if (errMsgView) {
                         if (err) {
+                            errMsgView.clearText();
                             errMsgView.setText(err.message);
 
                             if (MciViewIds.header.subject === err.view.getId()) {
diff --git a/core/system_view_validate.js b/core/system_view_validate.js
index 4c5521d18..8b4115afe 100644
--- a/core/system_view_validate.js
+++ b/core/system_view_validate.js
@@ -21,8 +21,10 @@ exports.validateEmailAvail = validateEmailAvail;
 exports.validateBirthdate = validateBirthdate;
 exports.validatePasswordSpec = validatePasswordSpec;
 
+const emptyFieldError = () => new Error('Field cannot be empty');
+
 function validateNonEmpty(data, cb) {
-    return cb(data && data.length > 0 ? null : new Error('Field cannot be empty'));
+    return cb(data && data.length > 0 ? null : emptyFieldError);
 }
 
 function validateMessageSubject(data, cb) {
@@ -91,6 +93,10 @@ function validateGeneralMailAddressedTo(data, cb) {
     //  :TODO: remove hard-coded FTN check here. We need a decent way to register global supported flavors with modules.
     const addressedToInfo = getAddressedToInfo(data);
 
+    if (addressedToInfo.name.length === 0) {
+        return cb(emptyFieldError());
+    }
+
     if (Message.AddressFlavor.Local !== addressedToInfo.flavor) {
         return cb(null);
     }

From 88a1b0ea694d855030b22cdd1d1192869a926c04 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Tue, 10 Oct 2023 20:42:15 +0000
Subject: [PATCH 15/17] locked python version to fix startup issue

---
 .devcontainer/devcontainer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 57d83312b..7c1a92454 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 "features": {
 	"ghcr.io/devcontainers/features/python:1": {
 		"installTools": true,
-		"version": "latest"
+		"version": "3.11"
 	},
 	"ghcr.io/devcontainers-contrib/features/curl-apt-get:1": {},
 	"ghcr.io/jungaretti/features/ripgrep:1": {},

From f5b0a8bb602cbce48b1efa093cb51055dc9fb2a3 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Wed, 11 Oct 2023 00:19:43 +0000
Subject: [PATCH 16/17] Updated the SSH version, config, and documentation

---
 .gitignore                                    |   4 +-
 UPGRADE.md                                    |   4 +
 core/config_default.js                        |  28 +-
 docs/Gemfile.lock                             |   3 +
 docs/_config.yml                              |   1 +
 docs/_docs/servers/loginservers/ssh.md        |  81 +++-
 .../troubleshooting/ssh-troubleshooting.md    |  41 ++
 package.json                                  |   2 +-
 yarn.lock                                     | 405 +++++++-----------
 9 files changed, 276 insertions(+), 293 deletions(-)
 create mode 100644 docs/_docs/troubleshooting/ssh-troubleshooting.md

diff --git a/.gitignore b/.gitignore
index 2d3facac5..7479afc17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,6 @@ logs/
 mail/
 node_modules/
 docs/_site/
-docs/.sass-cache/
\ No newline at end of file
+docs/.sass-cache/
+
+docs/.jekyll-cache/
diff --git a/UPGRADE.md b/UPGRADE.md
index 5f2458bef..3a4f8c2cd 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -35,6 +35,10 @@ npm install # or simply 'yarn'
 
 ## 0.0.13-beta to 0.0.14-beta
 
+* Due to changes to supported algorithms in newer versions of openssl, the default list of supported algorithms for the ssh login server has changed. There are both removed ciphers as well as optional new kex algorithms available now. ***NOTE:*** Changes to supported algorithms are only needed to support keys generated with new versions of openssl, if you already have a ssl key in use you should not have to make any changes to your config.
+  * Removed ciphers: 'blowfish-cbc', 'arcfour256', 'arcfour128', and 'cast128-cbc'
+  * Added kex: 'curve25519-sha256', 'curve25519-sha256@libssh.org', 'curve25519-sha256', 'curve25519-sha256@libssh.org', 'ecdh-sha2-nistp256', 'ecdh-sha2-nistp384', 'ecdh-sha2-nistp521'
+
 ## 0.0.12-beta to 0.0.13-beta
 * To enable the new Waiting for Caller (WFC) support, please see [WFC](docs/modding/wfc.md).
 * :exclamation: The SSH server's `ssh2` module has gone through a major upgrade. Existing users will need to comment out two SSH KEX algorithms from their `config.hjson` if present else clients such as NetRunner will not be able to connect over SSH. Comment out `diffie-hellman-group-exchange-sha256` and `diffie-hellman-group-exchange-sha1`
diff --git a/core/config_default.js b/core/config_default.js
index 6be17ec95..7421afc74 100644
--- a/core/config_default.js
+++ b/core/config_default.js
@@ -188,22 +188,15 @@ module.exports = () => {
                 //
                 //  1 - Generate a Private Key (PK):
                 //  Currently ENiGMA 1/2 requires a PKCS#1 PEM formatted PK.
-                //  To generate a secure PK, issue the following command:
-                //
-                //  > openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 \
-                //      -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa \
-                //      -out ./config/security/ssh_private_key.pem -aes128
-                //
-                //  (The above is a more modern equivalent of the following):
-                //  > openssl genrsa -aes128 -out ./config/security/ssh_private_key.pem 2048
+                //  For information on generating a key, see:
+                //  https://nuskooler.github.io/enigma-bbs/servers/loginservers/ssh.html#generate-a-ssh-private-key
                 //
                 //  2 - Set 'privateKeyPass' to the password you used in step #1
                 //
                 //  3 - Finally, set 'enabled' to 'true'
                 //
                 //  Additional reading:
-                //  - https://blog.sleeplessbeastie.eu/2017/12/28/how-to-generate-private-key/
-                //  - https://gist.github.com/briansmith/2ee42439923d8e65a266994d0f70180b
+                //  - https://nuskooler.github.io/enigma-bbs/servers/loginservers/ssh.html
                 //
                 privateKeyPem: paths.join(
                     __dirname,
@@ -222,14 +215,18 @@ module.exports = () => {
                 //
                 algorithms: {
                     kex: [
+                        'curve25519-sha256',
+                        'curve25519-sha256@libssh.org',
                         'ecdh-sha2-nistp256',
                         'ecdh-sha2-nistp384',
                         'ecdh-sha2-nistp521',
                         'diffie-hellman-group14-sha1',
                         'diffie-hellman-group1-sha1',
-                        //  Group exchange not currnetly supported
-                        //  'diffie-hellman-group-exchange-sha256',
-                        //  'diffie-hellman-group-exchange-sha1',
+                        'curve25519-sha256',
+                        'curve25519-sha256@libssh.org',
+                        'ecdh-sha2-nistp256',
+                        'ecdh-sha2-nistp384',
+                        'ecdh-sha2-nistp521',
                     ],
                     cipher: [
                         'aes128-ctr',
@@ -242,12 +239,7 @@ module.exports = () => {
                         'aes256-cbc',
                         'aes192-cbc',
                         'aes128-cbc',
-                        'blowfish-cbc',
                         '3des-cbc',
-                        'arcfour256',
-                        'arcfour128',
-                        'cast128-cbc',
-                        'arcfour',
                     ],
                     hmac: [
                         'hmac-sha2-256',
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 8eb98aeb4..8176ae451 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -77,6 +77,8 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     minitest (5.19.0)
+    nokogiri (1.15.4-aarch64-linux)
+      racc (~> 1.4)
     nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     pathutil (0.16.2)
@@ -101,6 +103,7 @@ GEM
     webrick (1.8.1)
 
 PLATFORMS
+  aarch64-linux
   x86_64-linux
 
 DEPENDENCIES
diff --git a/docs/_config.yml b/docs/_config.yml
index 34a77aa39..7d70ca43e 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -131,4 +131,5 @@ collections:
       - admin/oputil.md
       - admin/updating.md
       - troubleshooting/monitoring-logs.md
+      - troubleshooting/ssh-troubleshooting.md
 
diff --git a/docs/_docs/servers/loginservers/ssh.md b/docs/_docs/servers/loginservers/ssh.md
index 1d55299d8..cee33a3d1 100644
--- a/docs/_docs/servers/loginservers/ssh.md
+++ b/docs/_docs/servers/loginservers/ssh.md
@@ -3,9 +3,13 @@ layout: page
 title: SSH Server
 ---
 ## SSH Login Server
+
 The ENiGMA½ SSH *login server* allows secure user logins over SSH (ssh://).
 
+*Note:* If you run into any troubles during SSH setup, please see [Troubleshooting SSH](../../troubleshooting/ssh-troubleshooting.md)
+
 ## Configuration
+
 Entries available under `config.loginServers.ssh`:
 
 | Item | Required | Description |
@@ -20,10 +24,8 @@ Entries available under `config.loginServers.ssh`:
 | `algorithms` | :-1: | Configuration block for SSH algorithms. Includes keys of `kex`, `cipher`, `hmac`, and `compress`. See the algorithms section in the [ssh2-streams](https://github.com/mscdex/ssh2-streams#ssh2stream-methods) documentation for details. For defaults set by ENiGMA½, see `core/config_default.js`.
 | `traceConnections` | :-1: | Set to `true` to enable full trace-level information on SSH connections.
 
-
 * *IMPORTANT* With the `privateKeyPass` option set, make sure that you verify that the config file is not readable by other users!
 
-
 ### Example Configuration
 
 ```hjson
@@ -40,43 +42,94 @@ Entries available under `config.loginServers.ssh`:
 ```
 
 ## Generate a SSH Private Key
+
 To utilize the SSH server, an SSH Private Key (PK) will need generated. OpenSSH or (with some versions) OpenSSL can be used for this task:
 
-### OpenSSH
+### OpenSSH (Preferred)
+
+#### OpenSSH Install - Linux / Mac
+
+If it is not already available, install OpenSSH using the package manager of your choice (should be pre-installed on most distributions.)
+
+#### Running OpenSSH - Linux / Mac
+
+From the root directory of the Enigma BBS, run the following:
+
+```shell
+mkdir -p config/security
+ssh-keygen -t rsa -m PEM -h -f config/security/ssh_private_key.pem
+```
+
+#### Windows Install - OpenSSH
+
+OpenSSH may already be installed, try running `ssh-keygen.exe`. If not, see this page: [Install OpenSSH for Windows](https://learn.microsoft.com/en-us/windows-server/administration/openssh/openssh_install_firstuse?tabs=gui)
+
+#### Running OpenSSH - Windows
+
+After installation, go to the root directory of your enigma project and run:
 
-```bash
-ssh-keygen -m PEM -h -f config/ssh_private_key.pem
+```powershell
+mkdir .\config\security -ErrorAction SilentlyContinue
+ssh-keygen.exe -t rsa -m PEM -h -f .\config\security\ssh_private_key.pem
 ```
 
+#### ssh-keygen options
+
 Option descriptions:
 
 | Option | Description |
 |------|-------------|
+| `-t rsa` | Use the RSA algorithm needed for the `ssh2` library |
 | `-m PEM` | Set the output format to `PEM`, compatible with the `ssh2` library |
 | `-h` | Generate a host key |
 | `-f config/ssh_private_key.pem` | Filename for the private key. Used in the `privateKeyPem` option in the configuration |
 
 When you execute the `ssh-keygen` command it will ask for a passphrase (and a confirmation.) This should then be used as the value for `privateKeyPass` in the configuration.
 
-
 ### OpenSSL
 
-If you do not have OpenSSH installed or if you have trouble with the above OpenSSH commands, using some versions for OpenSSL (before version 3) the following commands may work as well:
+#### Open SSL Install - Linux / Mac
 
+If not already installed, install via the `openssl` package on most package managers.
 
-```bash
-openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa -out ./config/ssh_private_key.pem -aes128
+#### Open SSL Install - Windows
+
+```powershell
+winget install -e --id ShiningLight.OpenSSL
 ```
 
-Or for even older OpenSSL versions:
+#### Running OpenSSL
 
-```bash
-openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+*Note:* Using `ssh-keygen` from OpenSSL is recommended where possible. If you have trouble with the above OpenSSH commands, using some versions for OpenSSL (before version 3) the following commands may work as well:
+
+#### Running OpenSSL - Linux / Mac
+
+Run the following from the root directory of Enigma
+
+```shell
+mkdir -p config/security
+openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl rsa -out ./config/security/ssh_private_key.pem -aes128
 ```
 
-Note that you may need `-3des` for very old implementations or SSH clients!
+#### Running OpenSSL - Windows
+
+Run the following from the root directory of Enigma (note: you may need to specify the full path to openssl.exe if it isn't in your system path, on my system it was `C:\Program Files\OpenSSL-Win64\bin\openssl.exe`):
+
+```powershell
+mkdir .\config\security -ErrorAction SilentlyContinue
+openssl.exe genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -pkeyopt rsa_keygen_pubexp:65537 | openssl.exe rsa -out ./config/security/ssh_private_key.pem -aes128
+```
+
+#### Running Older OpenSSL
+
+For older OpenSSL versions, the following command has been known to work:
+
+```shell
+openssl genrsa -aes128 -out ./config/ssh_private_key.pem 2048
+```
 
+*Note:* that you may need `-3des` for very old implementations or SSH clients!
 
 ## Prompt
 
-The keyboard interactive prompt can be customized using a `SSHPMPT.ASC` art file. See [art](../../art/general.md) for more information on configuring. This prompt includes a `newUserNames` variable to show the list of allowed new user names (see `firstMenuNewUser` above.) See [mci](../../art/mci.md) for information about formatting this string. Note: Regardless of the content of the `SSHPMPT.ASC` file, the prompt is surrounded by "Access denied", a newline, the prompt, another newline, and then the string "\[username]'s password: ". This normally occurs after the first password prompt (no art is shown before the first password attempt is made.)
+The keyboard interactive prompt can be customized using a `SSHPMPT.ASC` art file. See [art](../../art/general.md) for more information on configuring. This prompt includes a `newUserNames` variable to show the list of allowed new user names (see `firstMenuNewUser` above.) See [mci](../../art/mci.md) for information about formatting this string. Note: Regardless of the content of the `SSHPMPT.ASC` file, the prompt is surrounded by "Access denied", a newline, the prompt, another newline, and then the string "\[username]'s password: ". This normally occurs after the first password prompt (no art is shown before the first password attempt is made.)
\ No newline at end of file
diff --git a/docs/_docs/troubleshooting/ssh-troubleshooting.md b/docs/_docs/troubleshooting/ssh-troubleshooting.md
new file mode 100644
index 000000000..66beda9ce
--- /dev/null
+++ b/docs/_docs/troubleshooting/ssh-troubleshooting.md
@@ -0,0 +1,41 @@
+---
+layout: page
+title: Troubleshooting SSH
+---
+
+Stuck with errors trying to get your SSH setup configured? See below for some common problems. Or as always, reach out to us by creating an [Issue](https://github.com/NuSkooler/enigma-bbs/issues) or start a [Discussion](https://github.com/NuSkooler/enigma-bbs/discussions)
+
+## No Such File or Directory
+
+***Symptom:***
+BBS not starting with an error similar to the following:
+
+```shell
+Error initializing: Error: ENOENT: no such file or directory, open '<path>/config/security/ssh_private_key.pem'
+```
+
+***Solution:***
+Several things can cause this:
+
+1. `ssh_private_key.pem` was installed to the wrong location. Make sure that it is in the `config/security` directory and has the name matching the error message. You can also change your `config.hjson` if you prefer to point to the location of the key file.
+2. `ssh_private_key.pem` has the wrong file permissions. Verify that the file will be readable by the user that the BBS is running as. Because it is a cryptographic key however, we do recommend that access is restricted only to that user.
+
+## Error With Netrunner
+
+***Symptom:***
+Some ssh clients connect, but Netrunner (and other older clients) get a connection failed message and the following is in the log:
+
+```shell
+"level":40,"error":"Handshake failed","code":2,"msg":"SSH connection error"
+```
+
+***Solution:***
+
+The key was most likely not generated with the `-t rsa` option, and is using a newer algorithm that is not supported by Netrunner and similar clients. Regenerate the certificate with the `-t rsa` option.
+
+***Symptom:***
+Some ssh clients connect, but Netrunner (and other older clients) get a connection failed message and the following is in the log:
+
+```shell
+"level":40,"error":"Group exchange not implemented for server","msg":"SSH connection error"
+```
diff --git a/package.json b/package.json
index fbf0a977a..d8ff15159 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
         "sanitize-filename": "^1.6.3",
         "sqlite3": "5.1.6",
         "sqlite3-trans": "1.3.0",
-        "ssh2": "1.11.0",
+        "ssh2": "1.14.0",
         "systeminformation": "5.21.7",
         "telnet-socket": "0.2.4",
         "temptmp": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 5a208495c..20a5083c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -77,7 +77,7 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.5":
   version "2.0.5"
   resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
@@ -126,12 +126,12 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn@^8.8.0:
+"acorn@^6.0.0 || ^7.0.0 || ^8.0.0", acorn@^8.8.0:
   version "8.8.0"
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
-agent-base@6, agent-base@^6.0.2:
+agent-base@^6.0.2, agent-base@6:
   version "6.0.2"
   resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -172,12 +172,7 @@ ansi-escapes@^4.2.1:
   dependencies:
     type-fest "^0.5.2"
 
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
@@ -227,7 +222,7 @@ argparse@^2.0.1:
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"
-  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
   dependencies:
     array-uniq "^1.0.1"
 
@@ -239,9 +234,9 @@ array-union@^2.1.0:
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
-asn1@^0.2.4:
+asn1@^0.2.6:
   version "0.2.6"
   resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
@@ -256,7 +251,7 @@ async@3.2.4:
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==
 
 base64-js@^1.3.1:
   version "1.5.1"
@@ -266,7 +261,7 @@ base64-js@^1.3.1:
 bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
   dependencies:
     tweetnacl "^0.14.3"
 
@@ -304,7 +299,7 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.1, braces@^3.0.2:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -321,7 +316,7 @@ bser@2.1.1:
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer@^5.5.0:
   version "5.7.1"
@@ -333,12 +328,13 @@ buffer@^5.5.0:
 
 "buffers@github:NuSkooler/node-buffers":
   version "0.1.1"
-  resolved "git+ssh://git@github.com/NuSkooler/node-buffers.git#cd0855598f7048b02f0a51c90e22573973e9e2c2"
+  resolved "git+ssh://git@github.com/NuSkooler/node-buffers.git"
+  integrity sha512-UH53hA0xhBZCtWRo4pm4SZgpPC6VFZgCdYPnk2Mk0AK8SwE9qaJTGMFG1Oz1i/8MUsC7BS2PeUgFHrGSD2yhuA==
 
-buildcheck@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.3.tgz"
-  integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
+buildcheck@~0.0.6:
+  version "0.0.6"
+  resolved "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz"
+  integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
 bunyan@1.8.15:
   version "1.8.15"
@@ -386,15 +382,7 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -437,7 +425,7 @@ cli-width@^3.0.0:
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
 coffee-script@^1.12.4:
   version "1.12.7"
@@ -464,20 +452,20 @@ color-support@^1.1.2, color-support@^1.1.3:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-cpu-features@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.4.tgz"
-  integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==
+cpu-features@~0.0.8:
+  version "0.0.9"
+  resolved "https://registry.npmjs.org/cpu-features/-/cpu-features-0.0.9.tgz"
+  integrity sha512-AKjgn2rP2yJyfbepsmLfiYcmtNn/2eUvocUyM/09yB0YDiz39HteK/5/T4Onf0pmdYDMgkBoGvRLvEguzyL7wQ==
   dependencies:
-    buildcheck "0.0.3"
-    nan "^2.15.0"
+    buildcheck "~0.0.6"
+    nan "^2.17.0"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
@@ -488,20 +476,13 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-debug@4, debug@^4.1.0, debug@^4.3.2, debug@^4.3.3:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
-debug@^4.1.1:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"
-  integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
-  dependencies:
-    ms "2.1.2"
-
 deep-extend@^0.5.1:
   version "0.5.1"
   resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz"
@@ -510,7 +491,7 @@ deep-extend@^0.5.1:
 deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw==
 
 deepdash@^5.3.9:
   version "5.3.9"
@@ -523,14 +504,14 @@ deepdash@^5.3.9:
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==
   dependencies:
     clone "^1.0.2"
 
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/del/-/del-3.0.0.tgz"
-  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU= sha512-7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A==
   dependencies:
     globby "^6.1.0"
     is-path-cwd "^1.0.0"
@@ -542,7 +523,7 @@ del@^3.0.0:
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
 denque@^2.0.1:
   version "2.1.0"
@@ -576,7 +557,7 @@ doctrine@^3.0.0:
 dtrace-provider@~0.8:
   version "0.8.7"
   resolved "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.7.tgz"
-  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ=
+  integrity sha1-3JObTT4GIM/gwc2APQ0tftBP/QQ= sha512-V+HIGbAdxCIxddHNDwzXi6cx8Cz5RRlQOVcsryHfsyVVebpBEnDwHSgqxpgKzqeU/6/0DWqRLAGUwkbg2ecN1Q==
   dependencies:
     nan "^2.10.0"
 
@@ -594,7 +575,7 @@ emoji-regex@^8.0.0:
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-encoding@^0.1.12:
+encoding@^0.1.0, encoding@^0.1.12:
   version "0.1.13"
   resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -621,7 +602,7 @@ err-code@^2.0.2:
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
@@ -658,7 +639,7 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@8.21.0:
+eslint@>=5, eslint@>=7.0.0, eslint@8.21.0:
   version "8.21.0"
   resolved "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz"
   integrity sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==
@@ -726,12 +707,7 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"
-  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
-
-estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
@@ -741,12 +717,7 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.2.tgz"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
-
-exec-sh@^0.3.4:
+exec-sh@^0.3.2, exec-sh@^0.3.4:
   version "0.3.6"
   resolved "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
@@ -769,7 +740,7 @@ execa@^4.0.0:
 exiftool@^0.0.3:
   version "0.0.3"
   resolved "https://registry.npmjs.org/exiftool/-/exiftool-0.0.3.tgz"
-  integrity sha1-9YqSvXcnCtxU8xUc7WGko6tp1wc=
+  integrity sha1-9YqSvXcnCtxU8xUc7WGko6tp1wc= sha512-7xq/yI+ESuZEApWOTxp7bJ12XRjt+3LDqkCBLBkfrYDF3hQE65Lid/U2xYf7iCZ2LUBRWqsix1fXEfGvn9oTGw==
 
 external-editor@^3.0.3:
   version "3.0.3"
@@ -804,7 +775,7 @@ fast-json-stable-stringify@^2.0.0:
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
   version "1.13.0"
@@ -881,12 +852,12 @@ fs-minipass@^2.0.0:
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
 gauge@^3.0.0:
   version "3.0.2"
@@ -938,21 +909,10 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
-glob@8.0.3:
-  version "8.0.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
-  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^5.0.1"
-    once "^1.3.0"
-
 glob@^6.0.1:
   version "6.0.4"
   resolved "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
-  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=
+  integrity sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI= sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==
   dependencies:
     inflight "^1.0.4"
     inherits "2"
@@ -996,6 +956,17 @@ glob@^7.1.4:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@8.0.3:
+  version "8.0.3"
+  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 globals@^13.15.0:
   version "13.17.0"
   resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"
@@ -1018,7 +989,7 @@ globby@^11.1.0:
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw= sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==
   dependencies:
     array-union "^1.0.1"
     glob "^7.0.3"
@@ -1026,17 +997,7 @@ globby@^6.1.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-graceful-fs@^4.1.6:
-  version "4.1.11"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-graceful-fs@^4.2.10, graceful-fs@^4.2.6:
+graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.6:
   version "4.2.10"
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -1068,7 +1029,7 @@ hjson@3.2.2:
 
 http-cache-semantics@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-proxy-agent@^4.0.1:
@@ -1100,13 +1061,6 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-iconv-lite@0.6.3, iconv-lite@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
 iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
@@ -1114,6 +1068,13 @@ iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.2, iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13:
   version "1.2.1"
   resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
@@ -1124,7 +1085,7 @@ ignore@^5.2.0:
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
-import-fresh@^3.0.0:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"
   integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
@@ -1132,18 +1093,10 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-fresh@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"
-  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
@@ -1158,17 +1111,12 @@ infer-owner@^1.0.4:
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@^2.0.4:
+inherits@^2.0.3, inherits@^2.0.4, inherits@2:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -1210,21 +1158,14 @@ ip@^2.0.0:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-glob@^4.0.1, is-glob@^4.0.3:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -1249,7 +1190,7 @@ is-number@^7.0.0:
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"
-  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
+  integrity sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0= sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
@@ -1261,7 +1202,7 @@ is-path-in-cwd@^1.0.0:
 is-path-inside@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz"
-  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  integrity sha1-jvW33lBDej/cprToZe96pVy0gDY= sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g==
   dependencies:
     path-is-inside "^1.0.1"
 
@@ -1278,7 +1219,7 @@ is-unicode-supported@^0.1.0:
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 js-yaml@^4.1.0:
   version "4.1.0"
@@ -1295,7 +1236,7 @@ json-schema-traverse@^0.4.1:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 jsonfile@^6.0.1:
   version "6.0.1"
@@ -1331,7 +1272,7 @@ lodash.merge@^4.6.2:
   resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21:
+lodash@^4.17.15, lodash@^4.17.21, lodash@4.17.21:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -1344,11 +1285,6 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-lru-cache@7.13.2:
-  version "7.13.2"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.2.tgz"
-  integrity sha512-VJL3nIpA79TodY/ctmZEfhASgqekbT574/c4j3jn4bKXbSCnTTCH/KltZyvL2GlV+tGSMtsWyem8DCX7qKTMBA==
-
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
@@ -1356,6 +1292,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@7.13.2:
+  version "7.13.2"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.2.tgz"
+  integrity sha512-VJL3nIpA79TodY/ctmZEfhASgqekbT574/c4j3jn4bKXbSCnTTCH/KltZyvL2GlV+tGSMtsWyem8DCX7qKTMBA==
+
 make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
@@ -1388,7 +1329,7 @@ make-fetch-happen@^9.1.0:
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= sha512-M/XvMZ6oK4edXjvg/ZYyzByg8kjpVrF/m0x3wbhOlzJfsQgFkqP1rJnLnJExOcslmLSSeLiN6NmF+cBoKJHGTg==
   dependencies:
     tmpl "1.0.x"
 
@@ -1402,15 +1343,7 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.2:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
-
-micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -1435,7 +1368,7 @@ mimic-fn@^2.1.0:
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2, "minimatch@2 || 3":
   version "3.1.2"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -1508,7 +1441,12 @@ minizlib@^2.0.0, minizlib@^2.1.1:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
+mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -1520,26 +1458,16 @@ mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.6"
 
-moment@2.29.4:
+moment@^2.19.3, moment@2.29.4:
   version "2.29.4"
   resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-moment@^2.19.3:
-  version "2.29.1"
-  resolved "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
-
-ms@2.1.2:
+ms@^2.0.0, ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0:
-  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 mute-stream@0.0.8:
   version "0.0.8"
   resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
@@ -1548,41 +1476,26 @@ mute-stream@0.0.8:
 mv@~2:
   version "2.1.1"
   resolved "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"
-  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=
+  integrity sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI= sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==
   dependencies:
     mkdirp "~0.5.1"
     ncp "~2.0.0"
     rimraf "~2.4.0"
 
-nan@^2.10.0:
-  version "2.11.1"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz"
-  integrity sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==
-
-nan@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
-nan@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-
-nan@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"
-  integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
+nan@^2.10.0, nan@^2.14.0, nan@^2.17.0:
+  version "2.18.0"
+  resolved "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"
+  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 ncp@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"
-  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
+  integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==
 
 negotiator@^0.6.2:
   version "0.6.3"
@@ -1630,7 +1543,7 @@ node-gyp@8.x:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
 node-pty@0.10.1:
   version "0.10.1"
@@ -1686,12 +1599,12 @@ npmlog@^6.0.0:
 object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
@@ -1732,7 +1645,7 @@ ora@^5.4.1:
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 otplib@11.0.1:
   version "11.0.1"
@@ -1782,12 +1695,12 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
-  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+  integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
@@ -1799,7 +1712,7 @@ path-type@^4.0.0:
   resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -1807,24 +1720,24 @@ picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 prelude-ls@^1.2.1:
   version "1.2.1"
@@ -1909,7 +1822,14 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^2.2.8, rimraf@^2.6.1:
+rimraf@^2.2.8:
+  version "2.6.2"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"
+  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
+  dependencies:
+    glob "^7.0.5"
+
+rimraf@^2.6.1:
   version "2.6.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -1926,14 +1846,14 @@ rimraf@^3.0.2:
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"
-  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=
+  integrity sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto= sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==
   dependencies:
     glob "^6.0.1"
 
 rlogin@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/rlogin/-/rlogin-1.0.0.tgz"
-  integrity sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM=
+  integrity sha1-2wcyKzEhkSZiXZ0KqYctfr6KxAM= sha512-WixxTud2iapeJBNqhZl3jQfXYqKolBjgQiQAwUzF6Uvc4s3Is26PjPxHOh/vHkEfvwdC15szq4mbMcHRT+C5Yg==
 
 rsvp@^4.8.4:
   version "4.8.5"
@@ -2032,12 +1952,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -2092,16 +2007,16 @@ sqlite3@5.1.6:
   optionalDependencies:
     node-gyp "8.x"
 
-ssh2@1.11.0:
-  version "1.11.0"
-  resolved "https://registry.npmjs.org/ssh2/-/ssh2-1.11.0.tgz"
-  integrity sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==
+ssh2@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.npmjs.org/ssh2/-/ssh2-1.14.0.tgz"
+  integrity sha512-AqzD1UCqit8tbOKoj6ztDDi1ffJZ2rV2SwlgrVVrHPkV5vWqGJOVp5pmtj18PunkPJAuKQsnInyKV+/Nb2bUnA==
   dependencies:
-    asn1 "^0.2.4"
+    asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
-    cpu-features "~0.0.4"
-    nan "^2.16.0"
+    cpu-features "~0.0.8"
+    nan "^2.17.0"
 
 ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
@@ -2110,24 +2025,6 @@ ssri@^8.0.0, ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz"
-  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^5.2.0"
-
 string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz"
@@ -2135,21 +2032,16 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-strip-ansi@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    ansi-regex "^5.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -2161,12 +2053,7 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"
-  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
-
-strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -2180,7 +2067,7 @@ supports-color@^7.1.0:
 
 systeminformation@5.21.7:
   version "5.21.7"
-  resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.21.7.tgz#53ef75daaf5d756d015f4bb02e059126ccac74f2"
+  resolved "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.7.tgz"
   integrity sha512-K3LjnajrazTLTD61+87DFg8IXFk5ljx6nSBqB8pQLtC1UPivAjDtTYGPZ8jaBFxcesPaCOkvLRtBq+RFscrsLw==
 
 tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
@@ -2213,17 +2100,17 @@ temptmp@^1.1.0:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 thirty-two@1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz"
-  integrity sha1-TKL//AKlEpDSdEueP1V2k8prYno=
+  integrity sha1-TKL//AKlEpDSdEueP1V2k8prYno= sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==
 
 through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 tmp@^0.0.33:
   version "0.0.33"
@@ -2252,7 +2139,7 @@ tr46@~0.0.3:
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"
-  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys=
+  integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==
   dependencies:
     utf8-byte-length "^1.0.1"
 
@@ -2264,7 +2151,7 @@ tslib@^2.1.0:
 tweetnacl@^0.14.3:
   version "0.14.5"
   resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -2317,12 +2204,12 @@ uri-js@^4.2.2:
 utf8-byte-length@^1.0.1:
   version "1.0.4"
   resolved "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"
-  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=
+  integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==
 
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid-parse@1.1.0:
   version "1.1.0"
@@ -2342,14 +2229,14 @@ v8-compile-cache@^2.0.3:
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= sha512-cF4je9Fgt6sj1PKfuFt9jpQPeHosM+Ryma/hfY9U7uXGKM7pJCsF0v2r55o+Il54+i77SyYWetB4tD1dEygRkw==
   dependencies:
     makeerror "1.0.x"
 
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
@@ -2388,7 +2275,7 @@ word-wrap@^1.2.3:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 ws@7.4.3:
   version "7.4.3"

From 270c09eb809e386916b3256064753ce46e2c3fa3 Mon Sep 17 00:00:00 2001
From: Nathan Byrd <techy1@gmail.com>
Date: Wed, 11 Oct 2023 00:28:13 +0000
Subject: [PATCH 17/17] Added a sentence

---
 docs/_docs/troubleshooting/ssh-troubleshooting.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/_docs/troubleshooting/ssh-troubleshooting.md b/docs/_docs/troubleshooting/ssh-troubleshooting.md
index 66beda9ce..4b59b4f59 100644
--- a/docs/_docs/troubleshooting/ssh-troubleshooting.md
+++ b/docs/_docs/troubleshooting/ssh-troubleshooting.md
@@ -39,3 +39,7 @@ Some ssh clients connect, but Netrunner (and other older clients) get a connecti
 ```shell
 "level":40,"error":"Group exchange not implemented for server","msg":"SSH connection error"
 ```
+
+***Solution:***
+
+Remove the following encryption protocols from your `config.hjson`: `diffie-hellman-group-exchange-sha256` and `diffie-hellman-group-exchange-sha1`
\ No newline at end of file