diff --git a/Docs/thornlist/spacetimex.th b/Docs/thornlist/spacetimex.th
new file mode 100644
index 00000000..093a5fa9
--- /dev/null
+++ b/Docs/thornlist/spacetimex.th
@@ -0,0 +1,179 @@
+# Component list for the Einstein Toolkit
+# $Revision$
+# $Date$
+# $HeadURL$
+
+!CRL_VERSION = 1.0
+
+!DEFINE ROOT = Cactus
+!DEFINE ARR = $ROOT/arrangements
+!DEFINE COMPONENTLIST_TARGET = $ROOT/thornlists/
+
+# This thorn list
+!TARGET = $ROOT
+!TYPE = git
+!URL = https://bitbucket.org/einsteintoolkit/manifest.git
+!REPO_PATH= $1
+!NAME = manifest
+!CHECKOUT = ./manifest
+
+# Cactus Flesh
+!TARGET = $ROOT
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/cactus.git
+!NAME = flesh
+!CHECKOUT = .clang-format CONTRIBUTORS COPYRIGHT doc lib Makefile README.md src
+
+# Simulation Factory
+!TARGET = $ROOT
+!TYPE = git
+!URL = https://bitbucket.org/simfactory/simfactory2.git
+!REPO_PATH=$1
+!NAME = simfactory2
+!CHECKOUT = ./simfactory
+
+# Example parameter files
+!TARGET = $ROOT
+!TYPE = git
+!URL = https://bitbucket.org/einsteintoolkit/einsteinexamples.git
+!CHECKOUT = par
+
+# Various Cactus utilities
+!TARGET = $ROOT/utils
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/utilities.git
+!REPO_PATH= $2
+!CHECKOUT = ./ParameterFiles ./Scripts ./Syntax
+
+# The GetComponents script
+!TARGET = $ROOT/bin
+!TYPE = git
+!URL = https://github.com/gridaphobe/CRL.git
+!CHECKOUT = GetComponents
+
+# CactusDoc thorns
+!TARGET = $ARR/CactusDoc
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/coredoc.git
+!NAME = CoreDoc
+!REPO_PATH= $1
+!CHECKOUT = ./CoreDoc
+
+# CactusBase thorns
+!TARGET = $ARR
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/cactusbase.git
+!REPO_PATH= $2
+!CHECKOUT =
+CactusBase/Boundary
+CactusBase/CoordBase
+CactusBase/Fortran
+CactusBase/InitBase
+CactusBase/IOUtil
+CactusBase/SymBase
+CactusBase/Time
+
+# CactusUtils thorns
+!TARGET = $ARR
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/cactusutils.git
+!REPO_PATH= $2
+!CHECKOUT = CactusUtils/Accelerator CactusUtils/OpenCLRunTime
+CactusUtils/Formaline
+CactusUtils/MemSpeed
+CactusUtils/NaNCatcher
+CactusUtils/Nice
+CactusUtils/NoMPI
+CactusUtils/SystemStatistics
+CactusUtils/SystemTopology
+CactusUtils/TerminationTrigger
+CactusUtils/TimerReport
+CactusUtils/Trigger
+CactusUtils/Vectors
+CactusUtils/WatchDog
+
+# Additional Cactus thorns
+!TARGET = $ARR
+!TYPE = git
+!URL = https://github.com/EinsteinToolkit/$1-$2
+!REPO_PATH = ../$1-$2
+!CHECKOUT =
+ExternalLibraries/BLAS
+ExternalLibraries/FFTW3
+ExternalLibraries/GSL
+ExternalLibraries/HDF5
+ExternalLibraries/hwloc
+ExternalLibraries/LAPACK
+ExternalLibraries/libjpeg
+ExternalLibraries/MPI
+ExternalLibraries/OpenSSL
+ExternalLibraries/PAPI
+ExternalLibraries/pthreads
+ExternalLibraries/zlib
+
+# Thorns required for CarpetX
+!TARGET = $ARR
+!TYPE = git
+!URL = https://github.com/rhaas80/$1-$2
+!REPO_PATH = ../$1-$2
+!CHECKOUT =
+ExternalLibraries/ADIOS2
+ExternalLibraries/AMReX
+ExternalLibraries/NSIMD
+ExternalLibraries/openPMD
+ExternalLibraries/Silo
+ExternalLibraries/ssht
+ExternalLibraries/yaml_cpp
+
+# Boost library
+!TARGET = $ARR
+!TYPE = git
+!URL = https://github.com/dradice/Boost.git
+!REPO_PATH = ../$2
+!CHECKOUT =
+ExternalLibraries/Boost
+
+# Numerical
+!TARGET = $ARR
+!TYPE = git
+!URL = https://bitbucket.org/cactuscode/numerical.git
+!REPO_PATH= $2
+!CHECKOUT =
+Numerical/AEILocalInterp
+
+# CarpetX thorns
+!TARGET = $ARR
+!TYPE = git
+!URL = https://github.com/eschnett/CarpetX.git
+!REPO_PATH= $2
+!CHECKOUT =
+CarpetX/ADMBaseX
+CarpetX/Algo
+CarpetX/Arith
+CarpetX/BoxInBox
+CarpetX/CarpetX
+CarpetX/CoordinatesX
+CarpetX/Derivs
+CarpetX/ErrorEstimator
+CarpetX/HydroBaseX
+CarpetX/Loop
+CarpetX/ODESolvers
+CarpetX/TmunuBaseX
+
+# SpacetimeX thorns
+!TARGET = $ARR
+!TYPE = git
+!URL = https://github.com/lwJi/SpacetimeX.git
+!REPO_PATH= $2
+!CHECKOUT =
+SpacetimeX/AHFinderDirect
+SpacetimeX/AHFinderX
+SpacetimeX/BrillLindquist
+SpacetimeX/Cowling
+SpacetimeX/Punctures
+SpacetimeX/SphericalHarmonics
+SpacetimeX/SphericalSurface
+SpacetimeX/StaticTrumpet
+SpacetimeX/TwoPunctures
+SpacetimeX/Weyl
+SpacetimeX/Z4c
diff --git a/scripts/spacetimex.th b/scripts/spacetimex.th
index b9d36abb..2f2efe0e 100644
--- a/scripts/spacetimex.th
+++ b/scripts/spacetimex.th
@@ -9,38 +9,6 @@
!DEFINE ARR = $ROOT/arrangements
!DEFINE COMPONENTLIST_TARGET = $ROOT/thornlists/
-
-
-# A note on CUDA and OpenCL:
-
-# The thorns supporting and using CUDA and OpenCL are working and are
-# part of the Einstein Toolkit. However, these thorns are currently
-# commented out in this thorn list because most machines do not have
-# CUDA or OpenCL libraries installed, and there are no good, free CUDA
-# or OpenCL implementations yet which could be shipped with Cactus.
-
-# If you want to experiment with CUDA or OpenCL and use these thorns
-# (or look at their documentation), then uncomment these thorns in
-# this thorn list, and use GetComponents to download these thorns.
-
-# You have to uncomment these thorns (not here, but further below):
-# - CactusExamples/HelloWorldCUDA
-# - CactusExamples/HelloWorldOpenCL
-# - CactusExamples/WaveToyOpenCL
-# - CactusUtils/OpenCLRunTime
-# - CactusUtils/Accelerator
-# - ExternalLibraries/OpenCL
-# - McLachlan/ML_WaveToy_CL
-
-# To download these thorns via GetComponents, use then the following
-# command (on the same system where you originally used
-# GetComponents):
-
-# cd Cactus (or whatever your source tree is called)
-# bin/GetComponents --update --root=. manifest/einsteintoolkit.th
-
-
-
# This thorn list
!TARGET = $ROOT
!TYPE = git
@@ -49,7 +17,6 @@
!NAME = manifest
!CHECKOUT = ./manifest
-
# Cactus Flesh
!TARGET = $ROOT
!TYPE = git
@@ -57,7 +24,6 @@
!NAME = flesh
!CHECKOUT = .clang-format CONTRIBUTORS COPYRIGHT doc lib Makefile README.md src
-
# Simulation Factory
!TARGET = $ROOT
!TYPE = git
@@ -66,14 +32,12 @@
!NAME = simfactory2
!CHECKOUT = ./simfactory
-
# Example parameter files
!TARGET = $ROOT
!TYPE = git
!URL = https://bitbucket.org/einsteintoolkit/einsteinexamples.git
!CHECKOUT = par
-
# Various Cactus utilities
!TARGET = $ROOT/utils
!TYPE = git
@@ -81,14 +45,12 @@
!REPO_PATH= $2
!CHECKOUT = ./ParameterFiles ./Scripts ./Syntax
-
# The GetComponents script
!TARGET = $ROOT/bin
!TYPE = git
!URL = https://github.com/gridaphobe/CRL.git
!CHECKOUT = GetComponents
-
# CactusDoc thorns
!TARGET = $ARR/CactusDoc
!TYPE = git
@@ -97,7 +59,6 @@
!REPO_PATH= $1
!CHECKOUT = ./CoreDoc
-
# CactusBase thorns
!TARGET = $ARR
!TYPE = git
@@ -105,159 +66,24 @@
!REPO_PATH= $2
!CHECKOUT =
CactusBase/Boundary
-# CactusBase/CartGrid3D
CactusBase/CoordBase
CactusBase/Fortran
CactusBase/InitBase
-# CactusBase/IOASCII
-# CactusBase/IOBasic
CactusBase/IOUtil
CactusBase/SymBase
CactusBase/Time
-# # CactusConnect thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactusconnect.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusConnect/HTTPD
-# CactusConnect/HTTPDExtra
-# CactusConnect/Socket
-
-# # CactusElliptic thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactuselliptic.git
-# !REPO_PATH= $2
-# !CHECKOUT = CactusElliptic/EllPETSc CactusElliptic/TATPETSc
-# CactusElliptic/EllBase
-# #DISABLED CactusElliptic/EllPETSc
-# CactusElliptic/EllSOR
-# CactusElliptic/TATelliptic
-# #DISABLED CactusElliptic/TATPETSc
-
-# # CactusExamples thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactusexamples.git
-# !REPO_PATH= $2
-# !CHECKOUT = CactusExamples/HelloWorldCUDA CactusExamples/HelloWorldOpenCL CactusExamples/WaveToyOpenCL
-# CactusExamples/DemoInterp
-# CactusExamples/FleshInfo
-# CactusExamples/HelloWorld
-# #DISABLED CactusExamples/HelloWorldCUDA
-# #DISABLED CactusExamples/HelloWorldOpenCL
-# CactusExamples/IDWaveMoL
-# CactusExamples/Poisson
-# CactusExamples/SampleBoundary
-# CactusExamples/SampleIO
-# CactusExamples/TimerInfo
-# CactusExamples/WaveMoL
-# CactusExamples/WaveToy1DF77
-# CactusExamples/WaveToy2DF77
-# #DISABLED CactusExamples/WaveToyOpenCL
-
-# # CactusIO thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactusio.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusIO/IOJpeg
-
-# # CactusNumerical thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactusnumerical.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusNumerical/Cartoon2D
-# CactusNumerical/Dissipation
-# CactusNumerical/InterpToArray
-# CactusNumerical/LocalInterp
-# CactusNumerical/LocalInterp2
-# CactusNumerical/LocalReduce
-# CactusNumerical/MoL
-# CactusNumerical/Noise
-# CactusNumerical/Norms
-# CactusNumerical/Periodic
-# CactusNumerical/ReflectionSymmetry
-# CactusNumerical/RotatingSymmetry180
-# CactusNumerical/RotatingSymmetry90
-# CactusNumerical/Slab
-# CactusNumerical/SlabTest
-# CactusNumerical/SpaceMask
-# CactusNumerical/SphericalSurface
-# CactusNumerical/SummationByParts
-# CactusNumerical/TensorTypes
-# CactusNumerical/TestLocalInterp2
-# CactusNumerical/TestLocalReduce
-
-# # CactusPUGH thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactuspugh.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusPUGH/PUGH
-# CactusPUGH/PUGHInterp
-# CactusPUGH/PUGHReduce
-# CactusPUGH/PUGHSlab
-
-# # CactusPUGHIO thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactuspughio.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusPUGHIO/IOHDF5
-# CactusPUGHIO/IOHDF5Util
-
-# CactusTest thorns
-!TARGET = $ARR
-!TYPE = git
-!URL = https://bitbucket.org/cactuscode/cactustest.git
-!REPO_PATH= $2
-!CHECKOUT = CactusTest/TestAllTypes
-#DISABLED CactusTest/TestAllTypes
-CactusTest/TestArrays
-CactusTest/TestComplex
-CactusTest/TestCoordinates
-CactusTest/TestFortranCrayPointers
-CactusTest/TestFortranDependencies1
-CactusTest/TestFortranDependencies2
-CactusTest/TestFpointerNULL
-CactusTest/TestFreeF90
-# CactusTest/TestGlobalReduce
-CactusTest/TestInclude1
-CactusTest/TestInclude2
-# CactusTest/TestLoop
-CactusTest/TestMath
-# CactusTest/TestMoL
-CactusTest/TestPar
-# CactusTest/TestReadWrite
-CactusTest/TestReduce
-CactusTest/TestSchedule
-CactusTest/TestStrings
-CactusTest/TestTable
-CactusTest/TestTimers
-CactusTest/TestTypes
-
# CactusUtils thorns
!TARGET = $ARR
!TYPE = git
!URL = https://bitbucket.org/cactuscode/cactusutils.git
!REPO_PATH= $2
!CHECKOUT = CactusUtils/Accelerator CactusUtils/OpenCLRunTime
-#DISABLED CactusUtils/Accelerator
CactusUtils/Formaline
CactusUtils/MemSpeed
CactusUtils/NaNCatcher
-# CactusUtils/NaNChecker
CactusUtils/Nice
CactusUtils/NoMPI
-#DISABLED CactusUtils/OpenCLRunTime
CactusUtils/SystemStatistics
CactusUtils/SystemTopology
CactusUtils/TerminationTrigger
@@ -266,209 +92,12 @@ CactusUtils/Trigger
CactusUtils/Vectors
CactusUtils/WatchDog
-# # CactusWave thorns
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/cactuscode/cactuswave.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CactusWave/IDScalarWave
-# CactusWave/IDScalarWaveC
-# CactusWave/IDScalarWaveCXX
-# CactusWave/IDScalarWaveElliptic
-# CactusWave/WaveBinarySource
-# CactusWave/WaveToyC
-# CactusWave/WaveToyCXX
-# CactusWave/WaveToyExtra
-# CactusWave/WaveToyF77
-# CactusWave/WaveToyF90
-# CactusWave/WaveToyFreeF90
-
-
-# # Carpet, the AMR driver
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/eschnett/carpet.git
-# !REPO_PATH= $2
-# !CHECKOUT = Carpet/doc
-# Carpet/Carpet
-# Carpet/CarpetEvolutionMask
-# Carpet/CarpetIOASCII
-# Carpet/CarpetIOBasic
-# Carpet/CarpetIOHDF5
-# Carpet/CarpetIOScalar
-# Carpet/CarpetIntegrateTest
-# Carpet/CarpetInterp
-# Carpet/CarpetInterp2
-# Carpet/CarpetLib
-# Carpet/CarpetMask
-# Carpet/CarpetProlongateTest
-# Carpet/CarpetReduce
-# Carpet/CarpetRegrid
-# Carpet/CarpetRegrid2
-# Carpet/CarpetRegridTest
-# Carpet/CarpetSlab
-# Carpet/CarpetTracker
-# Carpet/CycleClock
-# Carpet/HighOrderWaveTest
-# Carpet/LoopControl
-# Carpet/PeriodicCarpet
-# Carpet/ReductionTest
-# Carpet/ReductionTest2
-# Carpet/ReductionTest3
-# Carpet/RegridSyncTest
-# Carpet/TestCarpetGridInfo
-# Carpet/TestLoopControl
-# Carpet/Timers
-
-
-# # Thorns developed at the University of Catania
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/eloisa/ctthorns.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# CTThorns/CT_Analytic
-# CTThorns/CT_MultiLevel
-
-
-# # EinsteinAnalysis
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteinanalysis.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinAnalysis/ADMAnalysis
-# EinsteinAnalysis/ADMMass
-# EinsteinAnalysis/AHFinder
-# EinsteinAnalysis/AHFinderDirect
-# EinsteinAnalysis/CalcK
-# EinsteinAnalysis/EHFinder
-# EinsteinAnalysis/Extract
-# EinsteinAnalysis/Hydro_Analysis
-# EinsteinAnalysis/Multipole
-# EinsteinAnalysis/Outflow
-# EinsteinAnalysis/PunctureTracker
-# EinsteinAnalysis/QuasiLocalMeasures
-# EinsteinAnalysis/WeylScal4
-
-# # EinsteinBase
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteinbase.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinBase/ADMBase
-# EinsteinBase/ADMCoupling # deprecated
-# EinsteinBase/ADMMacros # deprecated
-# EinsteinBase/Constants
-# EinsteinBase/CoordGauge
-# EinsteinBase/EOS_Base
-# EinsteinBase/HydroBase
-# EinsteinBase/StaticConformal
-# EinsteinBase/TmunuBase
-
-# # EinsteinEOS
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteineos.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinEOS/EOS_Hybrid
-# EinsteinEOS/EOS_IdealFluid
-# EinsteinEOS/EOS_Omni
-# EinsteinEOS/EOS_Polytrope
-
-# # EinsteinEvolve
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteinevolve.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinEvolve/GRHydro
-# EinsteinEvolve/GRHydro_InitData
-# EinsteinEvolve/NewRad
-
-# # EinsteinExact
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://github.com/barrywardell/EinsteinExact.git
-# !REPO_PATH= $2
-# !CHECKOUT = EinsteinExact/doc EinsteinExact/m EinsteinExact/tests
-# EinsteinExact/EinsteinExact_Test
-# EinsteinExact/GaugeWave
-# EinsteinExact/KerrSchild
-# EinsteinExact/Minkowski
-# EinsteinExact/ModifiedSchwarzschildBL
-# EinsteinExact/ShiftedGaugeWave
-# EinsteinExact/Vaidya2
-
-
-# # EinsteinInitialData
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteininitialdata.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinInitialData/DistortedBHIVP
-# EinsteinInitialData/Exact
-# EinsteinInitialData/Hydro_InitExcision
-# EinsteinInitialData/Hydro_RNSID
-# EinsteinInitialData/IDAnalyticBH
-# EinsteinInitialData/IDAxiBrillBH
-# EinsteinInitialData/IDAxiOddBrillBH
-# EinsteinInitialData/IDBrillData
-# EinsteinInitialData/IDConstraintViolate
-# EinsteinInitialData/IDFileADM
-# EinsteinInitialData/IDLinearWaves
-# EinsteinInitialData/Meudon_Bin_BH
-# EinsteinInitialData/Meudon_Bin_NS
-# EinsteinInitialData/Meudon_Mag_NS
-# EinsteinInitialData/NoExcision
-# EinsteinInitialData/ReadInterpolate
-# EinsteinInitialData/RotatingDBHIVP
-# EinsteinInitialData/TOVSolver
-# EinsteinInitialData/TwoPunctures
-
-# # FLRW cosmological initial data
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://github.com/hayleyjm/FLRWSolver_public
-# !REPO_PATH = ../$2_public
-# !CHECKOUT =
-# EinsteinInitialData/FLRWSolver
-
-# # NRPyElliptic
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://github.com/assumpcaothiago/NRPyElliptic.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinInitialData/NRPyEllipticET
-
-# # Component list for NRPyPN
-# !TARGET = $ARR/EinsteinInitialData
-# !TYPE = git
-# !URL = https://github.com/zachetienne/nrpytutorial.git
-# !CHECKOUT = NRPyPN
-
-
-# # EinsteinUtils
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/einsteinutils.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# EinsteinUtils/SetMask_SphericalSurface
-# EinsteinUtils/TGRtensor
-
-
# Additional Cactus thorns
!TARGET = $ARR
!TYPE = git
!URL = https://github.com/EinsteinToolkit/$1-$2
!REPO_PATH = ../$1-$2
-!CHECKOUT = ExternalLibraries/OpenBLAS ExternalLibraries/OpenCL ExternalLibraries/pciutils ExternalLibraries/PETSc
+!CHECKOUT =
ExternalLibraries/BLAS
ExternalLibraries/FFTW3
ExternalLibraries/GSL
@@ -476,14 +105,9 @@ ExternalLibraries/HDF5
ExternalLibraries/hwloc
ExternalLibraries/LAPACK
ExternalLibraries/libjpeg
-ExternalLibraries/LORENE
ExternalLibraries/MPI
-#DISABLED ExternalLibraries/OpenBLAS
-#DISABLED ExternalLibraries/OpenCL
ExternalLibraries/OpenSSL
ExternalLibraries/PAPI
-#DISABLED ExternalLibraries/pciutils
-#DISABLED ExternalLibraries/PETSc
ExternalLibraries/pthreads
ExternalLibraries/zlib
@@ -503,93 +127,12 @@ ExternalLibraries/yaml_cpp
# Boost library
!TARGET = $ARR
-!TYPE = git
+!TYPE = git
!URL = https://github.com/dradice/Boost.git
-!REPO_PATH = ../$2
+!REPO_PATH = ../$2
!CHECKOUT =
ExternalLibraries/Boost
-# A newer version of Lorene, by default disabled
-!TARGET = $ARR
-!TYPE = git
-!URL = https://bitbucket.org/einsteintoolkit/lorene.git
-!NAME = LORENE2
-!REPO_PATH= ../$2
-!CHECKOUT = ExternalLibraries/LORENE2
-#DISABLED ExternalLibraries/LORENE2
-
-# RePrimAnd
-!TARGET = $ARR
-!TYPE = git
-!URL = https://github.com/wokast/RePrimAnd.git
-!REPO_PATH = ET_interface/thorns/$2
-!CHECKOUT = ExternalLibraries/RePrimAnd
-#DISABLED ExternalLibraries/RePrimAnd
-
-# # From Kranc (required e.g. by McLachlan)
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://github.com/ianhinder/Kranc.git
-# !REPO_PATH= Auxiliary/Cactus
-# !CHECKOUT =
-# KrancNumericalTools/GenericFD
-
-
-# Kuibit post-processing tools for simulations
-!TARGET = $ROOT/utils/Analysis
-!TYPE = git
-!URL = https://github.com/Sbozzolo/kuibit
-!REPO_PATH= $2
-!CHECKOUT = kuibit/docs kuibit/examples kuibit/kuibit kuibit/LICENSE kuibit/README.md
-
-
-# # Canuda thorns
-# #===============
-# # Canuda -- Lean
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/canuda/lean_public.git
-# !REPO_PATH = $2
-# !CHECKOUT =
-# Lean/LeanBSSNMoL
-# Lean/NPScalars
-
-
-# # Llama
-# !TARGET = $ARR
-# !TYPE = git
-# !AUTH_URL = https://bitbucket.org/llamacode/llama.git
-# !URL = https://bitbucket.org/llamacode/llama.git
-# !REPO_PATH= $2
-# !CHECKOUT = Llama/doc
-# Llama/ADMDerivatives
-# Llama/Coordinates
-# Llama/CoordinatesSymmetry
-# Llama/GlobalDerivative
-# Llama/Interpolate2
-# Llama/LlamaWaveToy
-# Llama/WaveExtractL
-
-
-# # McLachlan, the spacetime code
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/mclachlan.git
-# !REPO_PATH= $2
-# !CHECKOUT = McLachlan/doc McLachlan/m McLachlan/par McLachlan/ML_WaveToy_CL
-# McLachlan/ML_ADMConstraints
-# McLachlan/ML_ADMQuantities
-# McLachlan/ML_BSSN
-# McLachlan/ML_BSSN_Helper
-# McLachlan/ML_BSSN_Test
-# McLachlan/ML_CCZ4
-# McLachlan/ML_CCZ4_Helper
-# McLachlan/ML_CCZ4_Test
-# McLachlan/ML_WaveToy
-# #DISABLED McLachlan/ML_WaveToy_CL
-# McLachlan/ML_WaveToy_Test
-
-
# Numerical
!TARGET = $ARR
!TYPE = git
@@ -598,100 +141,6 @@ ExternalLibraries/Boost
!CHECKOUT =
Numerical/AEILocalInterp
-
-# # PITTNullCode
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/einsteintoolkit/pittnullcode.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# PITTNullCode/NullConstr
-# PITTNullCode/NullDecomp
-# PITTNullCode/NullEvolve
-# PITTNullCode/NullExact
-# PITTNullCode/NullGrid
-# PITTNullCode/NullInterp
-# PITTNullCode/NullNews
-# PITTNullCode/NullPsiInt
-# PITTNullCode/NullSHRExtract
-# PITTNullCode/NullVars
-# PITTNullCode/SphericalHarmonicDecomp
-# PITTNullCode/SphericalHarmonicRecon
-# PITTNullCode/SphericalHarmonicReconGen
-
-
-# Power -- waveform extrapolation
-!TARGET = $ROOT/utils/Analysis
-!TYPE = git
-!URL = https://git.ncsa.illinois.edu/elihu/Gravitational_Waveform_Extractor.git
-!REPO_PATH = $1
-!CHECKOUT = ./POWER
-
-
-# # Canuda -- Proca
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/canuda/Proca.git
-# !REPO_PATH = $2
-# !CHECKOUT =
-# Proca/NPScalars_Proca
-# Proca/ProcaBase
-# Proca/ProcaEvolve
-# Proca/Proca_simpleID
-# Proca/TwoPunctures_KerrProca
-
-
-# # Canuda -- Scalar
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/canuda/Scalar.git
-# !REPO_PATH = $2
-# !CHECKOUT = Scalar/doc
-# Scalar/ScalarBase
-# Scalar/ScalarEvolve
-# Scalar/ScalarInit
-
-
-# # Various thorns from WVU: IllinoisGRMHD, GiRaFFE, ShiftedKerrSchild, and FishboneMoncriefID
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/zach_etienne/wvuthorns.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# WVUThorns/Baikal
-# WVUThorns/BaikalVacuum
-# WVUThorns/Convert_to_HydroBase
-# WVUThorns/FishboneMoncriefID
-# WVUThorns/GiRaFFE
-# WVUThorns/GiRaFFEfood
-# WVUThorns/GiRaFFE_to_HydroBase
-# WVUThorns/ID_converter_GiRaFFE
-# WVUThorns/ID_converter_ILGRMHD
-# WVUThorns/IllinoisGRMHD
-# WVUThorns/Seed_Magnetic_Fields
-# WVUThorns/ShiftedKerrSchild
-
-
-# # Various "diagnostic" thorns from WVU:
-# # particle_tracerET
-# # smallbPoynET
-# # VolumeIntegrals_GRMHD
-# # VolumeIntegrals_vacuum
-# # ... and a thorn for seeding binary neutron stars with
-# # magnetic fields:
-# # Seed_Magnetic_Fields_BNS
-# !TARGET = $ARR
-# !TYPE = git
-# !URL = https://bitbucket.org/zach_etienne/wvuthorns_diagnostics.git
-# !REPO_PATH= $2
-# !CHECKOUT =
-# WVUThorns_Diagnostics/particle_tracerET
-# WVUThorns_Diagnostics/Seed_Magnetic_Fields_BNS
-# WVUThorns_Diagnostics/smallbPoynET
-# WVUThorns_Diagnostics/VolumeIntegrals_GRMHD
-# WVUThorns_Diagnostics/VolumeIntegrals_vacuum
-
-
# CarpetX thorns
!TARGET = $ARR
!TYPE = git
@@ -701,26 +150,15 @@ Numerical/AEILocalInterp
CarpetX/ADMBaseX
CarpetX/Algo
CarpetX/Arith
+CarpetX/BoxInBox
CarpetX/CarpetX
CarpetX/CoordinatesX
CarpetX/Derivs
CarpetX/ErrorEstimator
-CarpetX/FluxWaveToyX
CarpetX/HydroBaseX
CarpetX/Loop
CarpetX/ODESolvers
-CarpetX/PDESolvers
-CarpetX/PoissonX
-CarpetX/TestArrayGroup
-CarpetX/TestInterpolate
-CarpetX/TestNorms
-CarpetX/TestODESolvers
-CarpetX/TestODESolvers2
-CarpetX/TestOutput
-CarpetX/TestProlongate
-CarpetX/TestSymmetries
CarpetX/TmunuBaseX
-CarpetX/WaveToyX
# SpacetimeX thorns
!TARGET = $ARR