diff --git a/build-dakkar.sh b/build-dakkar.sh
index bb8bfee3..c37699b8 100644
--- a/build-dakkar.sh
+++ b/build-dakkar.sh
@@ -34,31 +34,51 @@ Options:
 ROM types:
 
   aex-pie
+  aex10
   aicp-oreo
+  aicp10
   aokp-oreo
+  aokp-pie
+  aokp10
   aosmp-pie
+  aosmp10
+  aospa
   aosp80
   aosp81
   aosp90
   aosp10
   aquarios
   carbon-oreo
+  carbon10
   crdroid-oreo
+  crdroid10
+  bootleggers
   e-pie
   e-oreo
   havoc-pie
+  havoc10
   komodo-pie
+  komodo10
   lineage151
   lineage160
+  lineage170
   mokee-oreo
+  mokee10
   pixel81
   pixel90
+  pixel10
   potato-pie
+  potato10
   rebellion-pie
+  rebellion10
   rr-oreo
+  rr10
   slim-oreo
+  slim-pie
+  slim10
   graphene9
   graphene10
+  atom
 
 Variants are dash-joined combinations of (in order):
 * processor type
@@ -92,7 +112,7 @@ function get_rom_type() {
                 mainrepo="https://android.googlesource.com/platform/manifest.git"
                 mainbranch="android-vts-8.0_r4"
                 localManifestBranch="master"
-                treble_generate=""
+                treble_generate="aosp"
                 extra_make_options=""
                 jack_enabled="true"
                 ;;
@@ -100,7 +120,7 @@ function get_rom_type() {
                 mainrepo="https://android.googlesource.com/platform/manifest.git"
                 mainbranch="android-8.1.0_r48"
                 localManifestBranch="android-8.1"
-                treble_generate=""
+                treble_generate="aosp"
                 extra_make_options=""
                 jack_enabled="true"
                 ;;
@@ -108,7 +128,7 @@ function get_rom_type() {
                 mainrepo="https://android.googlesource.com/platform/manifest.git"
                 mainbranch="android-9.0.0_r21"
                 localManifestBranch="android-9.0"
-                treble_generate=""
+                treble_generate="aosp"
                 extra_make_options=""
                 jack_enabled="false"
                 ;;
@@ -116,7 +136,7 @@ function get_rom_type() {
                 mainrepo="https://android.googlesource.com/platform/manifest.git"
                 mainbranch="android-10.0.0_r2"
                 localManifestBranch="android-10.0"
-                treble_generate=""
+                treble_generate="aosp"
                 extra_make_options=""
                 jack_enabled="false"
                 ;;
@@ -128,6 +148,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+            carbon10)
+                mainrepo="https://github.com/CarbonROM/android.git"
+                mainbranch="cr-8.0"
+                localManifestBranch="android-10.0"
+                treble_generate="carbon"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             e-pie)
                 mainrepo="https://gitlab.e.foundation/e/os/android/"
                 mainbranch="v1-pie"
@@ -160,6 +188,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+	    lineage170)
+                mainrepo="https://github.com/LineageOS/android.git"
+                mainbranch="lineage-17.0"
+                localManifestBranch="android-10.0"
+                treble_generate="lineage"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             rr-oreo)
                 mainrepo="https://github.com/ResurrectionRemix/platform_manifest.git"
                 mainbranch="oreo"
@@ -168,6 +204,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	   rr10)
+                mainrepo="https://github.com/ResurrectionRemix/platform_manifest.git"
+                mainbranch="10"
+                localManifestBranch="android-10.0"
+                treble_generate="rr"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             pixel81)
                 mainrepo="https://github.com/PixelExperience/manifest.git"
                 mainbranch="oreo-mr1"
@@ -184,6 +228,15 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+	   pixel10)
+                mainrepo="https://github.com/PixelExperience/manifest.git"
+                mainbranch="10"
+                localManifestBranch="android-10.0"
+                treble_generate="pixel"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
+
             potato-pie)
                 mainrepo="https://github.com/PotatoProject/manifest.git"
                 mainbranch="baked-release"
@@ -192,6 +245,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+	    potato10)
+                mainrepo="https://github.com/PotatoProject/manifest.git"
+                mainbranch="croquette-release"
+                localManifestBranch="android-10.0"
+                treble_generate="potato"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             crdroid-oreo)
                 mainrepo="https://github.com/crdroidandroid/android.git"
                 mainbranch="8.1"
@@ -200,6 +261,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	   crdroid10)
+                mainrepo="https://github.com/crdroidandroid/android.git"
+                mainbranch="10.0"
+                localManifestBranch="android-10.0"
+                treble_generate="crdroid"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             mokee-oreo)
                 mainrepo="https://github.com/mokee/android.git"
                 mainbranch="mko-mr1"
@@ -208,6 +277,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	    mokee10)
+                mainrepo="https://github.com/mokee/android.git"
+                mainbranch="mkq"
+                localManifestBranch="android-10.0"
+                treble_generate="mokee"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             aicp-oreo)
                 mainrepo="https://github.com/AICP/platform_manifest.git"
                 mainbranch="o8.1"
@@ -216,6 +293,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	    aicp10)
+                mainrepo="https://github.com/AICP/platform_manifest.git"
+                mainbranch="q10.0"
+                localManifestBranch="android-10.0"
+                treble_generate="aicp"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             aokp-oreo)
                 mainrepo="https://github.com/AOKP/platform_manifest.git"
                 mainbranch="oreo"
@@ -224,6 +309,22 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	    aokp-pie)
+                mainrepo="https://github.com/AOKP/platform_manifest.git"
+                mainbranch="pie"
+                localManifestBranch="android-9.0"
+                treble_generate="aokp"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
+	    aokp10)
+                mainrepo="https://github.com/AOKP/platform_manifest.git"
+                mainbranch="10"
+                localManifestBranch="android-10.0"
+                treble_generate="aokp"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             aex-pie)
                 mainrepo="https://github.com/AospExtended/manifest.git"
                 mainbranch="9.x"
@@ -232,6 +333,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+	    aex10)
+                mainrepo="https://github.com/AospExtended/manifest.git"
+                mainbranch="10.x"
+                localManifestBranch="android-10.0"
+                treble_generate="aex"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             slim-oreo)
                 mainrepo="https://github.com/SlimRoms/platform_manifest.git"
                 mainbranch="or8.1"
@@ -240,6 +349,22 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="true"
                 ;;
+	    slim-pie)
+                mainrepo="https://github.com/SlimRoms/platform_manifest.git"
+                mainbranch="9.0"
+                localManifestBranch="android-9.0"
+                treble_generate="slim"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
+	    slim10)
+                mainrepo="https://github.com/SlimRoms/platform_manifest.git"
+                mainbranch="10.0"
+                localManifestBranch="android-10.0"
+                treble_generate="slim"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="true"
+                ;;
             havoc-pie)
                 mainrepo="https://github.com/Havoc-OS/android_manifest.git"
                 mainbranch="pie"
@@ -248,14 +373,30 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+            havoc-10)
+                mainrepo="https://github.com/Havoc-OS/android_manifest.git"
+                mainbranch="10"
+                localManifestBranch="android-10.0"
+                treble_generate="havoc"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             komodo-pie)
                 mainrepo="https://github.com/KomodOS-Rom/platform_manifest.git"
-                mainbranch="pie"
+                mainbranch="pie-gsi"
                 localManifestBranch="android-9.0"
                 treble_generate="komodo"
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+            komodo10)
+                mainrepo="https://github.com/KomodOS-Rom/platform_manifest.git"
+                mainbranch="10"
+                localManifestBranch="android-10.0"
+                treble_generate="komodo"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             rebellion-pie)
                 mainrepo="https://github.com/RebellionOS/manifest.git"
                 mainbranch="pie"
@@ -272,6 +413,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+            aquarios10)
+                mainrepo="https://github.com/aquarios/manifest.git"
+                mainbranch="x"
+                localManifestBranch="android-10.0"
+                treble_generate="aquarios"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
             aosmp-pie)
                 mainrepo="https://gitlab.com/AOSmP/android_manifest.git"
                 mainbranch="pie"
@@ -280,6 +429,14 @@ function get_rom_type() {
                 extra_make_options="WITHOUT_CHECK_API=true"
                 jack_enabled="false"
                 ;;
+            aosmp10)
+                mainrepo="https://gitlab.com/AOSmP/android_manifest.git"
+                mainbranch="ten"
+                localManifestBranch="android-10.0"
+                treble_generate="aosmp"
+                extra_make_options="WITHOUT_CHECK_API=true"
+                jack_enabled="false"
+                ;;
 	    graphene9)
 	    	mainrepo="https://github.com/GrapheneOS/platform_manifest.git"
 		mainbranch="pie"
@@ -295,6 +452,20 @@ function get_rom_type() {
 		treble_generate="graphene"
 		extra_make_options="WITHOUT_CHECK_API=true"
 		jack_enabled="false"
+	   aospa)
+	   	mainrepo="https://github.com/AOSPA/manifest.git"
+		mainbranch="quartz"
+		localManifestBranch="android-10.0"
+		treble_generate="aospa"
+		extra_make_options="WITHOUT_CHECK_API=true"
+		jack_enabled="false"
+	   atom)
+	   	mainrepo="https://github.com/Atom-OS/frameworks_base.git"
+		mainbranch="android-10.0"
+		localManifestBranch="android-10.0"
+		treble_generate="atom"
+		extra_make_options="WITHOUT_CHECK_API=true"
+		jack_enabled="false"
 	   
 	esac
         shift