diff --git a/conda_lock.yml b/conda_lock.yml
index 35b3e63..e106fd3 100644
--- a/conda_lock.yml
+++ b/conda_lock.yml
@@ -1,176 +1,201 @@
 name: f4pga_arch_def_base
 channels:
-  - litex-hub
   - defaults
+  - litex-hub
 dependencies:
   - _libgcc_mutex=0.1=main
   - _openmp_mutex=5.1=1_gnu
-  - binutils-riscv64-elf=2.34=20220614_111216
+  - binutils-riscv64-elf=2.34=20220706_160221
   - bison=3.7.5=h2531618_1
-  - bzip2=1.0.8=h7b6447c_0
-  - c-ares=1.18.1=h7f8727e_0
-  - ca-certificates=2022.4.26=h06a4308_0
+  - bzip2=1.0.8=h5eee18b_6
+  - c-ares=1.34.5=hef5626c_0
+  - ca-certificates=2025.12.2=h06a4308_0
+  - cairo=1.18.4=h44eff21_0
   - capnproto=0.8.0=20210316_201220
   - capnproto-java=0.1.5_0012_g44a8c1e=20201104_165332
-  - certifi=2022.6.15=py37h06a4308_0
+  - certifi=2022.12.7=py37h06a4308_0
   - cloog=0.18.0=0
   - cmake=3.22.1=h1fce559_0
-  - cython=0.29.28=py37h295c915_0
-  - dbus=1.13.18=hb2f20db_0
-  - expat=2.4.4=h295c915_0
+  - cython=0.29.33=py37h6a678d5_0
+  - dbus=1.16.2=h5bd4931_0
+  - expat=2.7.3=h3385a95_0
   - flake8=4.0.1=pyhd3eb1b0_1
   - flex=2.6.4=ha10e3a4_1
-  - freetype=2.11.0=h70c0345_0
+  - flit-core=3.6.0=pyhd3eb1b0_0
+  - fontconfig=2.15.0=h2c49b7f_0
+  - freetype=2.13.3=h4a9f257_0
+  - fribidi=1.0.10=h7b6447c_0
   - gcc-riscv64-elf-newlib=9.2.0=20201119_154229
   - gcc-riscv64-elf-nostdc=9.2.0=20210923_213204
-  - glib=2.69.1=h4ff587b_1
-  - gmp=6.2.1=h295c915_3
-  - gperftools=2.9.1_7_gfe85bbd=20220512_085338
+  - glib=2.84.4=h5bdd934_0
+  - glib-tools=2.84.4=h8875d55_0
+  - gmp=6.3.0=h6a678d5_0
+  - gperftools=2.15_128_gfc496c8=20240223_100318
+  - graphite2=1.3.14=h295c915_1
+  - harfbuzz=10.2.0=hdfddeaa_1
   - icestorm=0.0_0719_g792cef0=20201120_145821
-  - icu=58.2=he6710b0_3
+  - icu=73.1=h6a678d5_0
   - importlib-metadata=4.11.3=py37h06a4308_0
   - isl=0.21=20210924_145025
   - iverilog=s20150603_0957_gad862020=20201120_145821
-  - krb5=1.19.2=hac12032_0
-  - ld_impl_linux-64=2.38=h1181459_1
-  - libcurl=7.82.0=h0b77cf5_0
-  - libedit=3.1.20210910=h7f8727e_0
+  - krb5=1.20.1=h568e23c_1
+  - ld_impl_linux-64=2.44=h153f514_2
+  - libcurl=8.2.1=h91b91d3_0
+  - libedit=3.1.20230828=h5eee18b_0
   - libev=4.33=h7f8727e_1
-  - libffi=3.3=he6710b0_2
-  - libftdi=1.3=20220104_201921
-  - libgcc-ng=11.2.0=h1234567_1
-  - libgomp=11.2.0=h1234567_1
-  - libiconv=1.16=h7f8727e_2
-  - libnghttp2=1.46.0=hce63b2e_0
-  - libpng=1.6.37=hbc83047_0
-  - libssh2=1.10.0=h8f2d780_0
-  - libstdcxx-ng=11.2.0=h1234567_1
-  - libunwind=1.5.0=h295c915_1
-  - libusb=1.0.20=20220104_201921
-  - libuuid=1.0.3=h7f8727e_2
-  - libuv=1.40.0=h7b6447c_0
-  - libxcb=1.15=h7f8727e_0
-  - libxml2=2.9.14=h74e7548_0
-  - lz4-c=1.9.3=h295c915_1
+  - libffi=3.4.4=h6a678d5_1
+  - libftdi=1.3=20220706_155948
+  - libgcc=15.2.0=h69a1729_7
+  - libgcc-ng=15.2.0=h166f726_7
+  - libglib=2.84.4=h77a78f3_0
+  - libgomp=15.2.0=h4751f2c_7
+  - libhwloc=2.12.1=default_hf1bbc79_1000
+  - libiconv=1.16=h5eee18b_3
+  - libnghttp2=1.52.0=ha637b67_1
+  - libpng=1.6.50=h2ed474d_0
+  - libssh2=1.10.0=h37d81fd_2
+  - libstdcxx=15.2.0=h39759b7_7
+  - libstdcxx-ng=15.2.0=hc03a8fd_7
+  - libunwind=1.8.3=h9c1abfd_0
+  - libusb=1.0.20=20220706_155948
+  - libuuid=1.41.5=h5eee18b_0
+  - libuv=1.44.2=h5eee18b_0
+  - libxcb=1.17.0=h9b100fa_0
+  - libxml2=2.13.9=h2c43086_0
+  - lz4-c=1.9.4=h6a678d5_1
   - m4=1.4.18=h4e445db_0
   - make=4.2.1=h1bed415_1
   - mccabe=0.7.0=pyhd3eb1b0_0
-  - mpc=1.1.0=h10f8cd9_1
-  - mpfr=4.0.2=hb69a4c5_1
-  - ncurses=6.3=h7f8727e_2
-  - nodejs=10.13.0=he6710b0_0
-  - openjdk=11.0.13=h87a67e3_0
+  - mpc=1.3.1=h5eee18b_0
+  - mpfr=4.2.1=h5eee18b_0
+  - ncurses=6.5=h7934f7d_0
+  - nodejs=18.16.0=ha637b67_1
+  - openjdk=21.0.6=h38aa4c6_0
   - openocd=0.10.0_1514_ga8edbd020=20201119_154304
-  - openssl=1.1.1p=h5eee18b_0
+  - openssl=1.1.1w=h7f8727e_0
   - packaging=21.3=pyhd3eb1b0_0
-  - pcre=8.45=h295c915_0
-  - perl=5.26.2=h14c3975_0
+  - pango=1.50.7=h668f713_2
+  - pcre2=10.46=hf426167_0
+  - perl=5.40.2=0_h5eee18b_perl5
   - pip=21.1.3=py37h06a4308_0
+  - pixman=0.46.4=h7934f7d_0
   - pkg-config=0.29.2=h1bed415_8
-  - prjxray-db=0.0_257_g0a0adde=20220512_085338
-  - prjxray-tools=0.1_2986_g5937733d=20220512_085338
+  - prjxray-db=0.0_257_g0a0adde=20240223_100318
+  - prjxray-tools=0.1_3252_gc6f57643=20240223_100318
+  - pthread-stubs=0.3=h0ce48e5_1
   - pycodestyle=2.8.0=pyhd3eb1b0_0
   - pyflakes=2.4.0=pyhd3eb1b0_0
-  - pyparsing=3.0.4=pyhd3eb1b0_0
-  - python=3.7.13=h12debd9_0
-  - readline=8.1.2=h7f8727e_1
+  - pyparsing=3.0.9=py37h06a4308_0
+  - python=3.7.16=h7a1cb2a_0
+  - readline=8.3=hc2a1206_0
   - rhash=1.4.1=h3c74f83_1
-  - setuptools=61.2.0=py37h06a4308_0
-  - sqlite=3.38.5=hc218d9a_0
-  - surelog=0.0_4939_g05069109a=20220620_233433_py37
-  - swig=4.0.2=h295c915_4
-  - symbiflow-yosys-plugins=1.0.0_7_919_g2fa356d=20220512_085338
-  - tbb=2020.3=hfd86e86_0
-  - tk=8.6.12=h1ccaba5_0
-  - typing_extensions=4.1.1=pyh06a4308_0
-  - vtr-optimized=8.0.0_5383_gc012f19d3=20220512_085338
-  - wheel=0.37.1=pyhd3eb1b0_0
-  - xz=5.2.5=h7f8727e_1
-  - yosys=0.17_7_g990c9b8e1=20220512_085338_py37
+  - setuptools=65.6.3=py37h06a4308_0
+  - sqlite=3.51.0=h2a70700_0
+  - surelog=1.82_61_g2c4aba06b5=20240223_100318_py37
+  - swig=4.3.1=h6f1ccf3_1
+  - symbiflow-yosys-plugins=1.20230425_62_g0ad1af2=20230606_125334
+  - tbb=2022.3.0=h698db13_0
+  - tk=8.6.15=h54e0aa7_0
+  - typing_extensions=4.4.0=py37h06a4308_0
+  - vtr-optimized=8.0.0_6959_ga7fae8fb2=20230131_213614
+  - wheel=0.38.4=py37h06a4308_0
+  - xorg-libx11=1.8.12=h9b100fa_1
+  - xorg-libxau=1.0.12=h9b100fa_0
+  - xorg-libxdmcp=1.1.5=h9b100fa_0
+  - xorg-libxext=1.3.6=h9b100fa_0
+  - xorg-libxrender=0.9.12=h9b100fa_0
+  - xorg-xorgproto=2024.1=h5eee18b_1
+  - xz=5.6.4=h5eee18b_1
+  - yosys=0.38_93_g84116c9a3=20240223_100318_py37
   - zachjs-sv2v=0.0.5_0025_ge9f9696=20201120_205532
-  - zipp=3.8.0=py37h06a4308_0
-  - zlib=1.2.12=h7f8727e_2
-  - zstd=1.5.2=ha4553b6_0
+  - zipp=3.11.0=py37h06a4308_0
+  - zlib=1.2.13=hd233ad5_2
+  - zstd=1.5.6=hc292b87_0
   - pip:
-    - Arpeggio==2.0.0
-    - attrs==21.4.0
-    - cairocffi==1.3.0
-    - CairoSVG==2.5.2
+    - Arpeggio==2.0.3
+    - attrs==24.2.0
+    - cairocffi==1.6.1
+    - CairoSVG==2.7.1
     - cffi==1.15.1
-    - charset-normalizer==2.1.0
-    - colorama==0.4.5
-    - cryptography==37.0.2
-    - cssselect2==0.6.0
+    - charset-normalizer==3.4.4
+    - colorama==0.4.6
+    - cryptography==45.0.7
+    - cssselect2==0.7.0
     - cycler==0.11.0
     - defusedxml==0.7.1
     - edalize @ https://github.com/lowRISC/edalize/archive/ot.zip
-    - f4pga @ https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
+    - exceptiongroup==1.3.1
+    - f4pga @ 
+    https://github.com/chipsalliance/f4pga/archive/main.zip#subdirectory=f4pga
     - fasm==0.0.2.post88
-    - fasm-utils @ git+https://github.com/QuickLogic-Corp/quicklogic-fasm-utils@3d6a375ddb6b55aaa5a59d99e44a207d4c18709f
-    - fonttools==4.33.3
-    - fusesoc @ git+https://github.com/lowRISC/fusesoc.git@14dfc825ced58fe1fb343662fa80fc4fbd0fdc50
-    - future==0.18.2
-    - gitdb==4.0.9
-    - GitPython==3.1.27
+    - fasm-utils @ 
+    git+https://github.com/QuickLogic-Corp/quicklogic-fasm-utils@3d6a375ddb6b55aaa5a59d99e44a207d4c18709f
+    - fonttools==4.38.0
+    - fusesoc @ 
+    git+https://github.com/lowRISC/fusesoc.git@14dfc825ced58fe1fb343662fa80fc4fbd0fdc50
+    - gitdb==4.0.12
+    - gitpython==3.1.45
     - hilbertcurve==1.0.5
-    - idna==3.3
-    - importlib-resources==5.8.0
-    - iniconfig==1.1.1
+    - idna==3.10
+    - importlib-resources==5.12.0
+    - iniconfig==2.0.0
     - intelhex==2.3.0
     - intervaltree==3.1.0
-    - Jinja2==3.1.2
-    - jsonmerge==1.8.0
-    - jsonschema==4.6.1
-    - kiwisolver==1.4.3
-    - lxml==4.9.1
-    - Mako==1.2.1
-    - MarkupSafe==2.1.1
-    - matplotlib==3.5.2
+    - jinja2==3.1.6
+    - jsonmerge==1.9.2
+    - jsonschema==4.17.3
+    - kiwisolver==1.4.5
+    - lxml==5.4.0
+    - Mako==1.2.4
+    - MarkupSafe==2.1.5
+    - matplotlib==3.5.3
     - numpy==1.21.6
-    - okonomiyaki==1.3.2
-    - parameterized==0.8.1
-    - pdfminer.six==20220524
-    - Pillow==9.2.0
-    - pluggy==1.0.0
+    - okonomiyaki==3.0.0
+    - parameterized==0.9.0
+    - pdfminer.six==20231228
+    - Pillow==9.5.0
+    - pkgutil-resolve-name==1.3.10
+    - pluggy==1.2.0
     - ply==3.11
-    - progressbar2==4.0.0
-    - py==1.11.0
+    - progressbar2==4.2.0
     - pycapnp==1.1.0
     - pycparser==2.21
-    - pyjson==1.3.0
-    - pyjson5==1.6.1
-    - pyrsistent==0.18.1
+    - pyjson==1.4.1
+    - pyjson5==1.6.9
+    - pyrsistent==0.19.3
     - pyserial==3.5
-    - pytest==7.1.2
+    - pytest==7.4.4
     - python-constraint==1.4.0
-    - python-dateutil==2.8.2
-    - python-fpga-interchange @ https://github.com/chipsalliance/python-fpga-interchange/archive/master.zip
-    - python-sat==0.1.7.dev18
-    - python-utils==3.3.3
+    - python-dateutil==2.9.0.post0
+    - python-fpga-interchange @ 
+    https://github.com/chipsalliance/python-fpga-interchange/archive/master.zip
+    - python-sat==1.8.dev24
+    - python-utils==3.5.2
     - pyusb==1.2.1
-    - PyYAML==6.0
-    # TODO: Change to upstream when https://github.com/QuickLogic-Corp/quicklogic-fasm/pull/26 is merged
-    - quicklogic-fasm @ https://github.com/antmicro/quicklogic-fasm/archive/607849ec0bdef8740be33dbaa49d15a3d400f809.zip
-    - requests==2.28.1
-    - rr-graph @ git+https://github.com/chipsalliance/f4pga-rr-graph.git@b8f0ebb6fd9842ae8bb7ff51a0adc5f76a853802
+    - PyYAML==6.0.1
+    - quicklogic-fasm @ 
+    https://github.com/QuickLogic-Corp/quicklogic-fasm/archive/aaf4c314a165b6185b0983019d8aae4d0d4db6cb.zip
+    - requests==2.31.0
+    - rr-graph @ 
+    git+https://github.com/chipsalliance/f4pga-rr-graph.git@b8f0ebb6fd9842ae8bb7ff51a0adc5f76a853802
     - scipy==1.7.3
-    - simplejson==3.17.6
-    - simplesat==0.8.2
-    - six==1.16.0
-    - smmap==5.0.0
+    - simplejson==3.20.2
+    - simplesat==0.9.1
+    - six==1.17.0
+    - smmap==5.0.2
     - sortedcontainers==2.4.0
-    - svgwrite==1.4.2
-    - termcolor==1.1.0
-    - textX==3.0.0
-    - tinycss2==1.1.1
+    - svgwrite==1.4.3
+    - termcolor==2.3.0
+    - textX==3.1.1
+    - tinycss2==1.2.1
     - tinyfpgab==1.1.0
     - tinyprog==1.0.21
     - tomli==2.0.1
-    - tqdm==4.64.0
-    - urllib3==1.26.9
+    - tqdm==4.67.1
+    - typing-extensions==4.7.1
+    - urllib3==2.0.7
     - webencodings==0.5.1
     - yapf==0.26.0
-    - zipfile2==0.0.12
     - -e third_party/prjxray
     - -e third_party/xc-fasm
     - -e third_party/qlf-fasm