From f16f97ba5905e285d914a9e0dc9291728c6d2c06 Mon Sep 17 00:00:00 2001
From: Alex Maestas <git@se30.xyz>
Date: Fri, 12 Aug 2022 06:10:12 +0000
Subject: [PATCH] Add Wombat theme, put it and Base16 theme in OS X menu

---
 .../English.lproj/Factor.nib/designable.nib   |  19 +++-
 .../English.lproj/Factor.nib/keyedobjects.nib | Bin 12586 -> 13221 bytes
 basis/ui/backend/cocoa/tools/tools.factor     |   4 +
 basis/ui/theme/switching/switching.factor     |   8 +-
 basis/ui/theme/wombat/authors.txt             |   1 +
 basis/ui/theme/wombat/summary.txt             |   1 +
 basis/ui/theme/wombat/wombat.factor           |  95 ++++++++++++++++++
 7 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100644 basis/ui/theme/wombat/authors.txt
 create mode 100644 basis/ui/theme/wombat/summary.txt
 create mode 100644 basis/ui/theme/wombat/wombat.factor

diff --git a/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib b/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
index 74aa0193e2..e5b14f8bba 100644
--- a/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
+++ b/Factor.app/Contents/Resources/English.lproj/Factor.nib/designable.nib
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1050" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
@@ -235,6 +235,18 @@
                                                 <action selector="switchDarkTheme:" target="-1" id="2ug-u3-tEU"/>
                                             </connections>
                                         </menuItem>
+                                        <menuItem title="Base16" id="c5Z-R4-x0d">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="switchBase16Theme:" target="-1" id="ilJ-8c-q12"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Wombat" id="5Ri-3D-AWg">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="switchWombatTheme:" target="-1" id="BQz-Hk-EpG"/>
+                                            </connections>
+                                        </menuItem>
                                     </items>
                                 </menu>
                             </menuItem>
@@ -277,6 +289,7 @@
                     </menu>
                 </menuItem>
             </items>
+            <point key="canvasLocation" x="-52" y="128"/>
         </menu>
     </objects>
 </document>
diff --git a/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib b/Factor.app/Contents/Resources/English.lproj/Factor.nib/keyedobjects.nib
index 67eedf8402b80dd76aead6b5f9a565daebf9cdd4..d5fe8592c7dd15a1b25d6f94fd8e02ed4af3a3b3 100644
GIT binary patch
literal 13221
zcmd6NcX$+4+xIy$dp6lV+k4Ao2Bh~UigZv2ge0_3T#|(>B-xNn=;e%vh)72er1vIB
z5fHH#ihxw<Vn+}W5mB-5-Lsp7;0rv@^?lzTFLQ;RnVs{ydpY;cfTH|JtfWqz69^*)
zu}FakQlccJ?U_0(TpWu;3wx!8igWTJaFv-_5-sYP8XYh=oKq4rA^hCZ{+uB#<Eik-
zaBj=8hmN6Sq(W+>>Cd@3wyG5y87m1Fw2Ky&WEJIxO2XX}pnc)11P<H`ahT%GMmz!O
zkRA!>5mXJ;K@Ct7)CUbf#b_iNg+`-E=y^05O-D1(Y%~`wLW|Kdv>dHMtI>M23B8VX
zpq*$JdK-O&4xmraL39M2Lg&zVbOC*izD8Hj59liT5#2z4pxfwA^cTihh1FPtIc&!c
z?8IK2iUlm<YPc?Lh#TR?xCw5K+u*ji9d3`G!rgEN&cs=`7k(Ot@Bo~H2jN0ojAOV2
zm*SBif`p&J6YwNF4Nu22@J##?UWgar#drx`f!E^=cq4ulZ^66p8+bQ<8-Ij9#(VKT
zd=MYUr|@Zf2A{>B<8SeI_!9meU&X)RoA_6J3*Tli!!RtPV3HXF!!bt2#Ml@w<74~`
z&s1ZoGc}kxOk<`A)0BCPX~VQ-+A&Wu=}Z>Wo$0}3GXt0$CYQ-$qD&DplqqG#Fk_i<
z%rnd}<|OkObB;OBe9PQmeqnC13f91Ktdr&0RQ3_J23wP@!!~7Gv8~z8Y#Q5>4Y5Pm
ze0DVZEIXB*$G*%iWLL5q*;m<3?Cb0fb|?D|`!4$)yPrM4e!?DOkFzJ(&)JLY*X(8X
zI{PzwgZ+cO&Hkxi6s$t0&?`&|yTYgND?~*VMO{TbMRP@4MVg|gqL-q#BBU6i$XCP^
zV-#Z*lN8S@UQ|p~Ojlea>EKw?*gfO}@*(+%{g`}A_L6;MKRG}?AqUAJa+rKdj*z3|
z7&%T(kdx#ya*CWLXUJJ{j+`eK$mirD`GR~&z9L_fZ^*agJ93G9PcD-y<Ogz<{79~m
zpU8FcGr2*2Avejd<QDmj{7(KLx5=O6FY-6}hul#jB~~&@R;f@DrBa!sOjfFtYNbZ0
zRqB*_r9sIljY^Z!th6YtN}JNIbSRxlm(s2DD7{Lb(yt6CgUS>ouS``6N>N!wSylOn
zvYN8GvWBvzvX-*0vO!jAVQGH;Ib=W_G9nW)BMY)38?qw@av~RUBM<T-AM&FB{G}is
zrFKut=oXEZ^i9iX9W5+`=!Ce9^-0U<63LBq59ODJWAQ-kl8D^I9eB9x8sZneccx{u
z%*hGIVvzxn{7A{j%4@l_jP4QmB0t<CQkWYZ4v*XK^Z5ON%2<jP$GWHH<cDIh-U-I!
zrzt~|B+N-zPhXd?L<#&SVG5BXVZ$*bg2+`+)ohSUUYHgt2ve3Sfc2I|khpR}vY^LM
zbyNe@M74S+;0xiYo{7_NtRE~bjg>?T60$Cb=W6#Xm;4y23k2$+`oK|HI*Ki&$^>9T
z)Ce@#xwIq%VrPU)R-lHcF{+)FmH`)ul}%ChW-f@Dp+`}3^cZ>^wLnjxmZ%kKjoP5L
zs2ysLI-ri|N%R!zggT=%)CF}#>8KmZK$$2Dbw@o=Pt*(brpeSz15}{ZX&u^-Hl>fz
zmb5+XMAK<^+J}bdKstmL(Goh6j;GJk$#fc>P3O^9=n}euuB994Yjpc@)ED&wY5Jq5
zQ3xc=h?W-TgnOiAbP5d!=TjARQrBsegK|+Ao*IY-p*$2pgV7L_j|xyBilQPk6cpRJ
zFkBEVjO28R=73jq4i}d8=Zx_j-*#weWLW2DZs$;JNH0)fVaI~dpfIQo3>p6ph-F4f
z^24&)A|t}N@$XIJ@7%dV)h2LeL>*K|wNyhbCxC|-a8QCu(J(X|jQ|tNv^qkuhymTW
zrT0o$DPeGl<o=wgRdJ+nP@rXgexM{8XjcpcrR!&C3>u5Zq49_UoP?f16VS8p_gtTj
zt=fcRkwJwSkx}8w&J(XmiLc_!fol$o3@R;-`w_TGw{R@3Hkmw>DET8+6v_#AY(qJ!
zr-&Nh&kS<LSI1*Y=DKxWIA=&fsCdY6^a5})1-*!-qG_^I#ejifq5Sx1Q8*_O%BMzZ
z;+USJ>(;9gs9SGr!q;Y^SpXW3%jIY$s-3ty2ffsvgV0Mja5-<w(HvC!UeV{pMPDF`
zPHk~MtumkS#WH_!Yh;u_`7LK~iOe9iQ&W%8b?ej!l=HCytprxf4Y3@pK(#^0P;qgn
za8S5oVO;Ia63neZYx{FnuvBCKXtAU?nqLv;E6^IW4%G&ICccytQna|-K{ud{C`3Kf
z|8RfYingJlR2_F2AN5j8&(4v;NCD_Gy`Vp5E(#Y9j20Kj_d+G5#c;dX35b9<;xVur
zvg95V0&fOemqZHV=A}VMHmTHg3M`ZhflwX-1?XJ}133Ub0D=yh68BO5ULW0y_M!cB
zFMXTtp$Gc391txn3A78zV)f^|(c;{2aa=c`<HFofac=y9uA#zkezS71523>#wn(ep
zU+kl0VR!<a1TLz?#eRfVrIzCmB{5+6G&+MyC9IaPhVIQy&<=D6=NF~7far+jMTaNu
zwJL`694@Y;jf<d-FM)OqkiYi*slQuB{Sx{fsHeoK*P=D4CA&i;H(VxZdR|r@TvbB8
z2FTX|xh^0#csTMc^jigTeOeEY(@P`eI!qthyChs(ARDSO{NDh72jCk4e3J*jV>X_>
zF5x5@-UNzDWSLsDaXI&0O7fuT?9bU`?&BAgibw3OI9Q8ZSP%4?0lnrApjVzPv9&@R
zEqxTcGXpFjrzfCOS}0S3^Lyx&IRbWJH_&*TK5>5v75Nya0ELAAYiSE=$?P4C7W66e
zd-=TFwQv<&6%bp|cK1cZ)e}79TDUeKwvHROEp1cbTDTsrk4ouZ^l!SiZ(NK{uq6l=
zhKtid8uMM(D!*MpxG8Q1ggelu9zYmBE*l58#I0n)Cg^1n#(9!<q?SHu;o*UD$n;L&
z#D(E9A1=RJL8t@n2!uM*t`8toCSe!cwL-!!G!1CP#VHGk^a1w`lybXt$31{XH=6YT
z8fC)t#r-O1WYP?9GFgst60M+ER)|p^isck?aTqA{pxO7QkXI(f5S$MbddBV4oA$bE
zrzkE0I~}1%>E6sNXv5M+WtGB5g_efl;eg+lKK*d~v3Ohset+5zJgZw6z<OsD!$$?!
zvv?wa4WQwNgH6FNR)FQw9BP4TRgyj;GpDqq0%{hX4N!yV;D<xa#|tW;A~X;9Y8@>a
znVyrC10NM&OYt%Q%cs$YgRQ}9E5HhA0kvdx4S`dq59?kee^$V4!kYnZD2+W74n^^f
z3OFq-rk3t)!ujEnaF5*hM+MxQ80ro!r6V2+hu_C?tx1@8I2}eUy)ytOr$kO5>7m}S
z_ywF-;O@r<0CyA}cYoYNWv+7s9|hdean~73$J}+D6Zj;!&Ov&J?#%#yO)u;NUfL#_
zQ(6!%ylbd)_&iXdbi%`_e1*TRpz;irs3i=IZ4nBi!ho0_?Her$7yb|E%lHaFPo&R3
z9Qr!`xdM6;eGbglIzJi<rw{L2miXeA6>9kn{|=}x(5Vkc{RiKvKz)%;0nf?^4GX8o
z`o`en->fo(Q3B|6I_sgJjF!<=fX<{ds3i~D`Ve%pVc3_oL^04s1~gBVNwkcWbIzC<
z3lNz@=ia9w!G{tJ3F8I=4lt+OG`|Es*DVZFm=dTk#qpDJ&NHL3IJp(r0VW98FVhA0
z6#%`PsG0aHrYhhkiv2TmKD9(S6YNb&p%)6k-X#P*QVDcL#c-7YpQUh?gTeu^UvX(+
zqSt5_$*+hcrY2Jhs4k?7A5QfjreOuu7wIBufs84$U)E#<$~tRK)?0!~{7!{%&6r1l
z%u>4ip=7{1a?MEyH<K=tg|k+&&%NSxgfbO^9Z`kl<U(;T{Ys{5&vXC|R?;>1F&)#X
z%yeCVx`VEYn{IVQ95UUQ47rPAB+Syi-Frj}286(#rr7XENlsqkGBYn+a9686nO;C_
z9o_ISVoz5hwjTVXRVWs&+o%FJad|Ipm>CGTuhPvA!!4+Uy9r{kQ)Eycuxm`P8^5|2
zwU~(k>K3}~VW^`jp>Bm(Yy%r7*s3Hz<%<Mne4D|HXDI9=%68!`VIwkf1>BQRZP+ix
zFXKCLW&(3`GuN4UmYK*r2mSnRW-=21k8H+FWu`IHnHlIJ`WtJRIp`WQ7azj=@i}Gz
zzKnl^U^g>Ma30RZ!<ZHLSv(6b#hdV(%sOU0vw_*jyvl51HZ!j=TbQlPHfB5XI<te>
z$?Rg@V0Po`(0Mgw-o_npcji6jeWnu=W{R1fOnYV@Y^yh57jqExXAYyI=n&mOchNV&
zAA|HAh|GoH!0*xb>4$V5wB?PU<J=ET^d}JNqaghrhCKNKB%nF;Q>YO=prRjxLOckH
z-cTql$LR_B89hzU(a-6Z^c#AKUZy|LYxHOO3;mV;M*pCHLX+1D+OmJ3W9mllNEm@5
zz6xepM^{Q%0ZpZcJ}%)Ts*<n@_8Ovub@5pXa~xHrJO4djskB#TPBUkiv#<}^P2Z5P
zwm(-t5u&w1MMcfzZ6H*WShMn-YOGn?!a@0wSYECCqT=Y_X7awWRj4>&u?r}BHS-)Z
zms!H>X7(|MK|7y-ynh0NGFRKrL9(fsRWRQ%mrx$_y*#mCCMJp<q@;J@*vDK)Lt);L
z87dwWE`hm3M(F@3YNc?iWqb|>icgFkQb7HC=vxpU38wqS5>F-`gKaGggP31Y_N)JL
zpGwa2FY{G4-uAQQ46{VuTe3>nxXA;S_}+?Dp+Z)}s#r~Y$kH*E5iSbB*dbaB!;+4%
zHj$V-Wy+NkmI`vlyDIuFwRAlbhlFVjKvo8Xrdozdz{zW<4i?1MJWy>3KIDBa#KUwp
zAge906pG7-aC{)Ere{XDcvu9cfR&8Sifn+b3P%43p7}VgCbk;NUP`w^dFwBa!xBqm
z^Tvagt;N<Zn;k7@YoXfzwPx-W|NnAXA7Dw|c!gzt&c?U;@p;!>9|8{=oS1n*Dma8s
z#8px5C8Hq-56Y^@l&f1p+Ab)2&AmC}UvawqzLtVIey^qCjoE*+)LjRMyp)Hd_psL!
zGQyEKdu?+gi7_NwfU-B<H-T+ocHB38T!K{bAb-X2ZAfK*mHX7YPWb?<{HJ9P^vlG;
zxL<ByHn4Nz(k41%E#$e+=*co;6y}zVLfAR%0%&GW(o=MA!aj>o_Nu$Nx>9Z|vrE~;
zlU<bvNoGSLgRtw6nq7~E!bmqWGzdt^dEzWRBR90|Aa)B;E;Mli6SjR2##Z=2LY`D5
zR$rj!sijvt7?KCl!Xrx32R(f8o9rI;t%}88a4fw@Eq&w5yF!l_iI&FF+dmuveg<Lp
zRzQ5sCDE_sp30UL3kMRL3K)?GU{)58VbjC+nE_Ym<5TuX1=4r)+jwvGWNAT>JaVnT
zN+0~+*m5hgl|6TlEiXfz`aY3kio*H%FwHHu=Q;LEu;=&mO1VA1LD?%3)wZm%ZNDGa
zTg$BYBYO?Fz8tsSkMt_FM4-`=w<Gy*$W|N#R&4e#gj=jUoJt^Er$13kzxYHqkWt2H
z`lAn7jiL%vv06)S$XavVyFL(#1$sqG1DPX>!vBr(b}~B^>U)&;E0p$|vhunEPvM-r
zGSw;63Jz3vlin&*ox+T=m&@%*yb-vs+IA+?25ftP?O)4^<L@9eOfQQ|WT8Vtz&iI6
z`R>}(N^5U}&t||+!xc*(C}XA6Rvp@>dT|-cGjD5XTmF(|%*u>L^JDSQR@9eM?>%kS
zzgwFJCbIb4>z+ggv#<Z0$o}Ipd3gM<iUKpXvWfytU?)XZT&~2VO$)u(DhXp*us#{_
zK0gp|aPPTD2%C+vSC;pX<qg|^*9i@QhI9Bm+Eh~*6_dEjB!06?kbqjTvb;5|XagTu
z3;-2=9lA${Fp<2g!+ua}%YG4*tL=YbcW8!>qSN<qT7_1Dxwgz{raaG1@HrV}FN3yO
zq}#KBM(0qZu%f+SB*nDl@)jWR<cxUh52IpNS@SP<g=Ggbt^7>>gzx3%ztRDB<mUf>
z9P#EK%8`8Fym<2u2@THV=6@%wlAHfZN4)t5%fm4--u%n<7y{?e{8I*wMDs6qpykK=
z6=(9DUGe5$?mfznUGe5$F8B8ya`Rt)^o%$Ea$@ZnZ~lJ;9J%?gbR?R8a6veBC7OTm
z3^?EddjELm4}GuV3t5X%(Bc2uE!6*qpIMpz-P^GL_n(2w%}Kh&%}FvyCdne*Ne|MK
z^dh}UHt9q9l76H=d76aC0Fpy;Ntg^IgGe5UkildK$tMM*kVHul8A^&tjFga4GK>r-
zBgjZHii{>>$XGItj3@9*J$Z&qAkUJC<T)~lJWnQ*7swRyBAH62k?CXxnMr1m*<=oR
ziOePQ$jf9tSwLPP3&|p~m@FYn$uhE>tRO4NDzciaA#2GxvYu=p8_BC=6WL5&BU{K;
zvW;vfuag~QC)q{bAiK$%WDj|ZyiMLA?~?Z<Y?QD`!e$9uBy5$iO~Q5wJ0$FsuuH;j
z340{$m9S63ehCL89F%a1gn0?4N?4FE?0X>qs!I3~30ISFbqUvya7_u<l5lMa*O72t
z3D=WweF-;^a6<_<l5k@QH<55t2{)7QqY`c|;m0Hld+8PuenP@6CEQBFttH$>!fhqo
zPQvXa+(E(}CH$m>pOSDV33rxonuNPZxT}QICEQKI84}KvaF&F-OSp%GdrG*MgnLUk
zTf%)L+*iW=B-~%ZPfIu?;Q<oPk#Mer!xA1S;XxA4lW;`BgC#sf!ub*|kZ_@dqY^HX
z@K6aCOE@Os5(&f9X_$nEOL&BYM@o2<ghxwwjD*KZc$|dCgXeGxj&MpYnNx9UPQz(A
z9jE6E9LE_s6KCcuoRzb2cFw^$ITz>VJe-&Faegkq1-TTC=TbR=6S*o}Rqhe48dsgG
z!PVqyakaTRTwSgnSD$OZHRKv`jkzXVQ?42JDA$~OjC-7G!9BsX<XUm9xi(x|t{vB&
z>%ev7p5&h5I&q!3G_DKRl}qQkaT#1Dm&JAGdT>3tUR-Z3o9n~%<@#~`xu>}hH-O9G
za=9=!kQ>D1aS?7XH-yXQ3b;Zp8ZQ#c+VTBr;=CSnbZI<L;I$EDLuDhFFLi8{cs-;I
zyo|P7*$~x6$?&R83cOZQ7t&4(cxR(GyreJ@-a(tp&SvLB%YBGF$9~V=RwOG@6^#|?
ziULK6V!T39Oi(<hn5>whn5LMan5~$rn6Fr<Sf$va*rs@0@qyx?;*{bG#ZQWxioc1H
z7>S8kh?i6&bxC9L1Vqv#h@vSFLDM06W<%u6gQ$50B4!Ch%L<5;H4r5mAVM}nbZmpj
z*a=bbCPc(L<UM#N>LYj?YCpX5bP?Wax(shL{Rr<PdEiZ>#>$q;PRdMWNI6iMrz}uL
zl|z*=WvOzw@_FSP<txfX%B9K`%GJs@m3x#Ym0u~ZC25jeNmY}oCDll(l~gCGUQ&ak
z=1FNu*+~PFh9<?5N|S~s(WJ>qGn3{fElJv%v@_{Q(y^oyNuMR1PCA=(KIx~Vzmon*
zM#;&^#$-=&Fu8tm^W@Cr?Bv18!;?oQk4_$&yf}Gj^77=B$*YssCa+K4mi&71C&}lN
zuOwehzLtDF`G(4%GOElftIDo&s@$p?s#>Z#s(Pvhs+Ovds!&y=Dpr-KUQ*3d%~!pm
zTBKT{TBh2h+M?R7+M#-1^`YvF>Wb>B>YD1h>W12^wyN!Fr`oOds{QKf>YD2M>Ne_j
z>JI8B)t%G@>Zp3CI;JjF4_A*=PgGA*&r+{YuTrm3uTyVOA5<S!A6K7LpHiPupHp8@
zU)C@hv&O2iYn&Rlrn%;E%@dkdnl_qtnhu(D&0x)N%}C8?%~;K1%~H*B%}UK`&05WR
z&1TIW&3?@%nnRjTHP<yaG&eQ3G{0+ZYyQ%zv>L5WYtVYNer-c-D{UKXJ8cJTL_0)V
zq%GE#XoqP>Xh&%$X(wwJYd2_L)o#{q(H_&D(0-;ptv#zful-#6gZ4)qqciA?I<wBI
zYou$UYo=?idtCQ~u9YrL*HxFR8>)-xN_E3^FY6ZQ7U~x3mg<)4R_eCsw&`Bi?bPkj
zy{-FDcT{&=cT#ss_q*=4?l0XxdZcIc3cX6N(Hr$XeL$b0Pt~{8x7T;nKc(-i@1jrF
zXX$(B`{*P3A^HM+R6j#MOFu_HSO2npfqtQWnSO<SoqmUYmwvZ?kN$%GqW(+$*ZObu
zm-LtQKk0wg|85|LB!kMJG1M^BGSo5DGc+(XGBh!?Ftj&h8oC>L8hRT>8^#*O8zjR7
z!$iX*!z{xb!xF<r!zROPhOLI<hLeU<hBJn9h6{#^hO35ahU<nKhFgZ;A$yr1OW7bp
zHHG~08040gkXPD52I&S_qJWEXL%A3?hnvg2%q`#+a*Mg8+-hzuw}bnD`-t1i?dPs=
zSGjB4b?ydtle@+J$^C8A7#&8J(PQ)(TNqm!TN~RN+Z#I?pEC9__A?e4#~Q~QCF2C+
zQsZ*tO5<wdTH|`-M&mZ)LE{<YIpYQ6MflB|F)2(+Q?f~I(wgd<TA8|-(oGqrEYmR4
z2-7Ij7}GctH9cdRYg%X8VcKQdZQ5hHV7h4f()6|IThk@eWwXs(-Q2|7%-r1kxH;S0
z*WBM6GUu4X=0WBX^KkPh^BD64^ULN{<~8PZ<_+e3<^$$~=ELSA=40j)=5yxj=D*E%
zEZD+Y0+tj@sztO^wN$gzu++1(vt(GZEIll}EW<1#ETb%AEaNQH@{DDYWr1adWvk^4
z%X^js)<M>Yb%?dV8nq6!#;m2*;ntDX(blon@m9$?!8*}8$vW9O#X8kG-8$1c+xn7q
zo^`(U73(7F66-SS3hOHC8tXdi2J5TV&DJf}ZPwSVJFRb6-?YAEeaHHq^#kii*1gvK
z)=#X5te;wsT8~>#T2EQeSkGB6ST9<?w0>><&icLeiuJ1Xn)SN%7wfOq->iRF|FZsL
z!#37NY{@pG&1|#Ucv}NoBU=+&Guvafm~D)0vTcfOs%^S$rfrUGo^8JEW80^;Gq$g6
z-`KvheQ&#ByK1{;yKcK-yJ`E=uC|-)wd{55_3RDojqFYA&FszXkK3QHx3agfx3hP!
zKWUHICHpk{4ErqmZ2L?0dG?p>3+xN+i|p^)KeT^r-)G-%|HOXKe%OA*{<r;(13Op;
zaU?lZ4vj<SFgP5JM;z51H667bbsfzdk2)T6baC`_^mpVsraGoOW;$j$<~Zg$<~im&
zUU7Wr_}H<}vET8D<B;R9<A~#!<DxU!sdj3edMD>JIW10`)8TYE{m!b+#?GeBN1cy3
zTR2-fTRYo2+dK1}h0Y>pu`}i@bq;fmaE@}WajtW2aK7r??A+qq=6v0`)A@$;ZRcL+
z7tXJo-#EW>e(${Eyz0E>yzac=yy?8<{M~um#k&Mo6<1YPHCGK+O;>GKT~}{cA6GwD
ze^<zr<H~gnbmh5Ta?NwicfI0T<XYld=33!e<yzy~=z7ETrt2-&JFb1M<F1pgQ?4_v
zbFK@ni*AKm?bf>WZq99TTiiBx(9OF$xSw=)a;Lewy1ThE-TmB8yC=FQxhK1)xTm_O
zyJxy*yO+6Fxc9jaxDUDyyN|e!xlg!1bN}T2*<<opJT{NR<MMbsK2JSQ15e14;|Y5P
zc_N-6o&rzQGt?9FjPXqNOz}+hO!vI(S>jpdS>ajbS>xH~Ip8_yIqW&&Ip#Uxx#YR*
zReQBwy_fTvycVy`D|oATJ9wY;cJiiqyL!8MGrdE-i@i&|%e^bTtG#Qz>%AMjo4l`i
zcX~hce(c@nJ>Wg=J?%Z~J@5V8d&h@;tdIDTd@7&D=kh)3d(79u*V5P8*VfnGm*soL
z_pI+Z-}Al~d@uT@`DXZL`R4c*_*VF~`nLOa_;&er`}X+W_Pyu(z<1Sm&3E1Rv+oz*
zufAKp-+j0JykGEF@mKX%^Vjg#^w;*+_4oGo@%QsT?H}OJ^$+w%{6qW&{!#u({u%!H
z{#X2q{7d}H{44xN{Kxz!{Ga(x`_KB%`!D*x^ndNY;{V0}m;avt3a|kZND9;m)C)8S
zGz>HjGz~NhG!Hx;=o}ao7!w#5pn+!s&jy|gOb$#5ObyHmyb@R(SQ=O!*c8|q*c13D
zI3SoC92m?C4i4rA3xh?$;$TT|Sa3veRB%jiT#yEz2|gQqF8F-#h2V?9X~7x6S;0BM
zxxtr%3xW%Si-Svp%Y!R}tAlHU>w_DEn}V+ew+6QdcLa9@cL(<b-wwVTd_VYM@Z;dV
z;DO-5;Njqr;IZI|;Ag?p!Lz~h!Ow$V1iub`8@v>}9Q+~pWAJ+LM(}3vR`B=W?cm?R
zJ1I<xCgp0%wUp~AH&Sk<+)DX9<#x(nDgW?@XLtp#<db<dujTbT$D4QyZ{r=ji}&z8
zKES8&sl3Qn<*V^E_*#4&z8>FzZ^Sp@oAJ&0$N4AtR(u=29p8a}lJCT)@m=|Dd?w$W
z@5%S(`|$nvr}+VVE<cdZ;|KEve3T!`$M{lyI6sOX!;j-BKY^dfKhM9wzsOJHXYjN5
zIs9DyWqtv_kYCI%<(Km-`PKYdem%dD-^9PhZ{@f1JNRAvZhjB{HvcaFKK~*AF~5&L
zz#rrf^GEr!sc)vfo%&wthpBs052PMSJ(7An^|RD7spnHKrhb+BZR+=_Kcrqu{W<k!
z>TjvHQ~wr_zzRx1C1?eMU=pl?LvRZ|At<B@RfK9nO`(oZUuYyW6`BhzgjPaZp@Z<0
zkS3%HnL-btx6oI3TF4Ow3K1b+hzi9*sW3tqEsPT+;aOpl@PaT^m?6v-<_hzLg~AeH
zxv)xDD{K%p30s8i!cJkg@Rsnd@PY8LuwOVRd@39hP70@mbHeAsm%=x~CE<$jqi|jL
zMYtvWA^auW5gCz)$)ZNoi3ZUqnnkN<7oDP8^oo8lDDt8pRuLZ&tBW<o+G1U?zSvM~
zEH)J%6(18@h%Lp|Vq3Aj*in2+>@0Q>)5Q!iOY9-`60^m=Vt+9t=7?c&kQfn%hy`L)
z94f}dQgOIAQXDOg6~~K`I6<5!P7)`JQ^cv_baAFQTYO2JC(ajN5f_O|#AV_Nah146
zTqkZ2UllitTf}YR>*7xF4e?F!E%6=kJ@EtaBXO^|U;IQoBz`I$6_1N2#Z%%L@tk-;
nyeNJtUJ-u~e-v+tzlpc2uvOr-IQbvLBtDgm6QAY(SF!&e!z`S?

literal 12586
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
D@LP&_

diff --git a/basis/ui/backend/cocoa/tools/tools.factor b/basis/ui/backend/cocoa/tools/tools.factor
index feed1a53dc..482330f849 100644
--- a/basis/ui/backend/cocoa/tools/tools.factor
+++ b/basis/ui/backend/cocoa/tools/tools.factor
@@ -45,6 +45,10 @@ IN: ui.backend.cocoa.tools
 
     METHOD: id switchDarkTheme: id app [ dark-mode f ] ;
 
+    METHOD: id switchWombatTheme: id app [ wombat-mode f ] ;
+
+    METHOD: id switchBase16Theme: id app [ base16-mode f ] ;
+
     METHOD: id refreshAll: id app [ [ refresh-all ] \ refresh-all call-listener f ] ;
 ;CLASS>
 
diff --git a/basis/ui/theme/switching/switching.factor b/basis/ui/theme/switching/switching.factor
index 9b22efc363..2e68a99911 100644
--- a/basis/ui/theme/switching/switching.factor
+++ b/basis/ui/theme/switching/switching.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2016 Nicolas Pénet.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: hashtables kernel namespaces sequences ui.theme
-vocabs.loader ;
+USING: hashtables kernel namespaces sequences ui.theme ui.theme.base16
+ui.theme.wombat vocabs.loader ;
 IN: ui.theme.switching
 
 SYMBOL: default-theme?
@@ -26,4 +26,8 @@ t default-theme? set-global
 
 : dark-mode ( -- ) dark-theme switch-theme ;
 
+: wombat-mode ( -- ) wombat-theme switch-theme ;
+
+: base16-mode ( -- ) base16-theme switch-theme ;
+
 { "ui.theme.switching" "ui.tools" } "ui.theme.switching.tools" require-when
diff --git a/basis/ui/theme/wombat/authors.txt b/basis/ui/theme/wombat/authors.txt
new file mode 100644
index 0000000000..d514ff4aab
--- /dev/null
+++ b/basis/ui/theme/wombat/authors.txt
@@ -0,0 +1 @@
+Alex Maestas
diff --git a/basis/ui/theme/wombat/summary.txt b/basis/ui/theme/wombat/summary.txt
new file mode 100644
index 0000000000..40faf8fada
--- /dev/null
+++ b/basis/ui/theme/wombat/summary.txt
@@ -0,0 +1 @@
+Port of the Wombat theme from Emacs and Vim
diff --git a/basis/ui/theme/wombat/wombat.factor b/basis/ui/theme/wombat/wombat.factor
new file mode 100644
index 0000000000..4a156d5225
--- /dev/null
+++ b/basis/ui/theme/wombat/wombat.factor
@@ -0,0 +1,95 @@
+USING: colors ui.theme ;
+IN: ui.theme.wombat
+SINGLETON: wombat-theme
+
+! This is a port of the `wombat` theme from emacs, adapted with permission from
+! Kristoffer Grönlund, who, in turn, adapted it from the Vim color scheme by
+! Lars H. Nielsen.
+
+M: wombat-theme toolbar-background COLOR: #454545 ;
+M: wombat-theme toolbar-button-pressed-background COLOR: #242424 ;
+
+M: wombat-theme menu-background COLOR: #384048 ;
+M: wombat-theme menu-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme status-bar-background COLOR: #384048 ;
+M: wombat-theme status-bar-foreground COLOR: white ;
+
+M: wombat-theme button-text-color COLOR: #303030 ;
+M: wombat-theme button-clicked-text-color COLOR: white ;
+
+M: wombat-theme line-color COLOR: #656565 ;
+
+M: wombat-theme column-title-background COLOR: #384048 ;
+
+M: wombat-theme roll-button-rollover-border COLOR: #a0a8b0 ;
+M: wombat-theme roll-button-selected-background COLOR: #a0a8b0 ;
+
+M: wombat-theme source-files-color COLOR: #95e454 ;
+M: wombat-theme errors-color COLOR: #e5786d ;
+M: wombat-theme details-color COLOR: #8ac6f2 ;
+
+M: wombat-theme debugger-color COLOR: #e5786d ;
+M: wombat-theme completion-color COLOR: #3f9f9e ;
+
+M: wombat-theme data-stack-color COLOR: #8ac6f2 ;
+M: wombat-theme retain-stack-color COLOR: #95e454 ;
+M: wombat-theme call-stack-color COLOR: #3f9f9e ;
+
+M: wombat-theme title-bar-gradient { COLOR: #242424 COLOR: #454545 } ;
+
+M: wombat-theme popup-color COLOR: #ddaa6f ;
+
+M: wombat-theme object-color COLOR: #8ac6f2 ;
+M: wombat-theme contents-color COLOR: #95e454 ;
+
+M: wombat-theme help-header-background COLOR: #384048 ;
+
+M: wombat-theme thread-status-stopped-background COLOR: #333333 ;
+M: wombat-theme thread-status-suspended-background COLOR: #242424 ;
+M: wombat-theme thread-status-running-background COLOR: #444444 ;
+
+M: wombat-theme thread-status-stopped-foreground COLOR: #8ac6f2 ;
+M: wombat-theme thread-status-suspended-foreground COLOR: #ddaa6f ;
+M: wombat-theme thread-status-running-foreground COLOR: #95e454 ;
+
+M: wombat-theme error-summary-background COLOR: #b85149 ;
+
+M: wombat-theme content-background COLOR: #242424 ;
+M: wombat-theme text-color COLOR: #f6f3e9 ;
+
+M: wombat-theme link-color COLOR: #8ac6f2 ;
+M: wombat-theme title-color COLOR: #a0a8b0 ;
+M: wombat-theme heading-color COLOR: #a0a8b0 ;
+M: wombat-theme snippet-color COLOR: #e5786d ;
+M: wombat-theme output-color COLOR: #e5786d ;
+M: wombat-theme deprecated-background-color COLOR: #454545 ;
+M: wombat-theme deprecated-border-color COLOR: #92a65e ;
+M: wombat-theme warning-background-color COLOR: #454545 ;
+M: wombat-theme warning-border-color COLOR: #8ac6f2 ;
+M: wombat-theme code-background-color COLOR: #303030 ;
+M: wombat-theme code-border-color COLOR: white ;
+M: wombat-theme help-path-border-color COLOR: #384048 ;
+
+M: wombat-theme tip-background-color COLOR: #303030 ;
+
+M: wombat-theme prompt-background-color COLOR: #92a65e ;
+
+M: wombat-theme dim-color COLOR: #8ac6f2 ;
+M: wombat-theme highlighted-word-color COLOR: #95e454 ;
+M: wombat-theme string-color COLOR: #95e454 ;
+M: wombat-theme stack-effect-color COLOR: #e5786d ;
+
+M: wombat-theme vocab-background-color COLOR: #303030 ;
+M: wombat-theme vocab-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme field-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme editor-caret-color COLOR: #92a65e ;
+M: wombat-theme selection-color COLOR: #444444 ;
+M: wombat-theme panel-background-color COLOR: #444444 ;
+M: wombat-theme focus-border-color COLOR: #a0a8b0 ;
+
+M: wombat-theme labeled-border-color COLOR: #303030 ;
+
+M: wombat-theme table-border-color COLOR: #a0a8b0 ;
-- 
2.34.1