diff --git a/exa.yaml b/exa.yaml
index 6201dbd..7295c1a 100644
--- a/exa.yaml
+++ b/exa.yaml
@@ -2,7 +2,7 @@ document: modulemd
 version: 2
 data:
   summary: Modern replacement for ls
-  description: |
+  description: |-
     exa is an improved file lister with more features and better defaults.
     It uses colours to distinguish file types and metadata.
     It knows about symlinks, extended attributes, and Git.
@@ -12,6 +12,7 @@ data:
   dependencies:
   - buildrequires:
       platform: []
+      rust: [stable]
       libgit2: [0.27]
     requires:
       platform: []
@@ -29,11 +30,8 @@ data:
       - exa
   filter:
     rpms:
-    # XXX: temporary workaround
-    - rust-packaging
-    - python3-rust2rpm
-    # crates, build-time only
     - rust-aho-corasick+default-devel
+    - rust-aho-corasick+std-devel
     - rust-aho-corasick-devel
     - rust-ansi_term+default-devel
     - rust-ansi_term-devel
@@ -221,11 +219,8 @@ data:
     - rust-zoneinfo_compiled-devel
   components:
     rpms:
-      rust-packaging:
-        buildorder: 0
-        rationale: Something needs to orchestrate build of all stuff below.
       rust-ansi_term:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -233,7 +228,7 @@ data:
           * rust-exa
         ref: 981f698b95b96924110b56201491bca38b4a43a8 # rust-ansi_term-0.11.0-5.fc30
       rust-bitflags:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -245,7 +240,7 @@ data:
             (built by rust-git2)
         ref: d6cb4b7f827a92a89c3d6c4744c6dd5525fc394f # rust-bitflags-1.0.4-4.fc30
       rust-byteorder:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -257,7 +252,7 @@ data:
             (built by rust-zoneinfo_compiled)
         ref: 9121d26b6afea36bcb39252abdb3e3826b37af11 # rust-byteorder-1.3.1-2.fc30
       rust-cc:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -279,9 +274,9 @@ data:
             (built by rust-libz-sys)
           * rust-openssl-sys-devel
             (built by rust-openssl-sys)
-        ref: 1c083a0231c3d6df486a0e7a5957b60112b55967 # rust-cc-1.0.31-1.fc31
+        ref: 50986962acfdc525fcd0a6bbd31ac16021d5c392 # rust-cc-1.0.35-1.fc31
       rust-cfg-if:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -293,7 +288,7 @@ data:
             (built by rust-log)
         ref: fa49aac8a48bd413f6e3f2062adbe2a4d56d9abf # rust-cfg-if-0.1.7-1.fc31
       rust-glob:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -301,7 +296,7 @@ data:
           * rust-exa
         ref: fd46b8ad640f8bfa05b032b38bc1e225c2bc2e7b # rust-glob-0.2.11-9.fc30
       rust-lazy_static:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -314,7 +309,7 @@ data:
             (built by rust-thread_local)
         ref: 6e30973f915da136bba20baa034e2cff95a6b74e # rust-lazy_static-1.3.0-3.fc31
       rust-libc:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -358,9 +353,9 @@ data:
             (built by rust-term_size)
           * rust-users-devel
             (built by rust-users)
-        ref: 9b95ae890adec9addc9b4f80fb02f2ea21ce06bb # rust-libc-0.2.50-1.fc31
+        ref: e7c60a86439ac84f37f6fba723ae8a12fc2f4226 # rust-libc-0.2.51-1.fc31
       rust-matches:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -378,7 +373,7 @@ data:
             (built by rust-url)
         ref: 8e9a1c4f46c1355869374fe7fb403a6b6c1b0fca # rust-matches-0.1.8-4.fc30
       rust-memchr:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -388,6 +383,8 @@ data:
           * rust-regex
 
           Required by:
+          * rust-aho-corasick+std-devel
+            (built by rust-aho-corasick)
           * rust-aho-corasick-devel
             (built by rust-aho-corasick)
           * rust-nom+std-devel
@@ -398,7 +395,7 @@ data:
             (built by rust-regex)
         ref: 1e687e82d0f14eca98597968c0985a0eaa048f38 # rust-memchr-2.2.0-2.fc31
       rust-natord:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -406,7 +403,7 @@ data:
           * rust-exa
         ref: 08910fee2e19a6b69f4c7d0a4d2c69590e9ca43e # rust-natord-1.0.9-6.fc30
       rust-num-traits:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -421,7 +418,7 @@ data:
             (built by rust-number_prefix)
         ref: f52b292282ba55da6bfe30e849f3e8a74fe9e1f9 # rust-num-traits-0.2.6-4.fc30
       rust-openssl-probe:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -429,7 +426,7 @@ data:
           * rust-git2
         ref: 190a76ba01abf8e5f727b5889037383cd045ca06 # rust-openssl-probe-0.1.2-7.fc30
       rust-percent-encoding:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -441,7 +438,7 @@ data:
             (built by rust-url)
         ref: 3454351c48f229751bbd1b0e0fa8622e6528d2b2 # rust-percent-encoding-1.0.1-7.fc30
       rust-pkg-config:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -465,7 +462,7 @@ data:
             (built by rust-openssl-sys)
         ref: 4ed2590b18b486e7105d76b94f9baad214b3d2a0 # rust-pkg-config-0.3.14-4.fc30
       rust-quick-error:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -477,7 +474,7 @@ data:
             (built by rust-humantime)
         ref: ce58a31b95536dc7c985ed30b7652944e0644234 # rust-quick-error-1.2.2-5.fc30
       rust-scoped_threadpool:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -485,7 +482,7 @@ data:
           * rust-exa
         ref: 68937e60199cbf8b67dfc72bfd6585fe8d12577f # rust-scoped_threadpool-0.1.9-4.fc31
       rust-semver-parser0.7:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -497,7 +494,7 @@ data:
             (built by rust-semver)
         ref: 171aa5834211cb7ba17fe68f68587879040bf342 # rust-semver-parser0.7-0.7.0-9.fc30
       rust-smallvec:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -509,7 +506,7 @@ data:
             (built by rust-unicode-normalization)
         ref: 0b1ca3633d5339c61780cbd948553ba37db89771 # rust-smallvec-0.6.9-2.fc31
       rust-termcolor:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -521,7 +518,7 @@ data:
             (built by rust-env_logger)
         ref: e9ebce417e8bd04ba8aa868874bfc9a969322b32 # rust-termcolor-1.0.4-4.fc31
       rust-ucd-util:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -533,7 +530,7 @@ data:
             (built by rust-regex-syntax)
         ref: b1e81c701e5edeeb5bf13f05529c9efd651d7cc3 # rust-ucd-util-0.1.3-2.fc30
       rust-unicode-width:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -549,7 +546,7 @@ data:
             (built by rust-term_grid)
         ref: 6b7a220e29805a34e566e0bbc056f04288e46b98 # rust-unicode-width-0.1.5-5.fc30
       rust-utf8-ranges:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -561,7 +558,7 @@ data:
             (built by rust-regex)
         ref: 9ffdb97b701fca2b72af10278be1a94dbf09fbf9 # rust-utf8-ranges-1.0.2-2.fc30
       rust-version_check:
-        buildorder: 10
+        buildorder: 0
         rationale: |-
           Dependency of other components.
 
@@ -573,7 +570,7 @@ data:
             (built by rust-nom)
         ref: 7b006b3abd5634172c1e3754529abe2123a1c4f5 # rust-version_check-0.1.5-4.fc30
       rust-aho-corasick:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -583,9 +580,9 @@ data:
           Required by:
           * rust-regex-devel
             (built by rust-regex)
-        ref: 24df14d51bc0cfcaff5a6481c6df1fca9348a658 # rust-aho-corasick-0.6.10-1.fc30
+        ref: 8ae49fe3cc182b7574c49496db81bfc23dc53a47 # rust-aho-corasick-0.7.3-1.fc31
       rust-atty:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -597,7 +594,7 @@ data:
             (built by rust-env_logger)
         ref: 8292e9fbe915444fb7fc60ae8843c039ae41ee5c # rust-atty-0.2.11-4.fc30
       rust-humantime:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -609,7 +606,7 @@ data:
             (built by rust-env_logger)
         ref: f3f737bd54171c69073df4e486febe2b8acf31a4 # rust-humantime-1.2.0-2.fc30
       rust-libz-sys:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -627,7 +624,7 @@ data:
             (built by rust-libssh2-sys)
         ref: b454b31cd446a8b4ebab06dcab69aeeb294a0a2a # rust-libz-sys-1.0.25-4.fc30
       rust-locale:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -640,7 +637,7 @@ data:
             (built by rust-datetime)
         ref: 78bb3add1e36117526ff39926c69cdfe9ccf1a58 # rust-locale-0.2.2-6.fc30
       rust-log:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -656,7 +653,7 @@ data:
             (built by rust-git2)
         ref: f2ed0b96f2aef62b3f25f527f3970f857e7e42a3 # rust-log-0.4.6-3.fc31
       rust-nom:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -666,9 +663,9 @@ data:
           Required by:
           * rust-iso8601-devel
             (built by rust-iso8601)
-        ref: f82caf4571f9166517d34634bfc38f9698401f89 # rust-nom-4.2.2-2.fc31
+        ref: 00735268850b17db7fe9eef47e6e03c4d3716a9b # rust-nom-4.2.3-1.fc31
       rust-num-traits0.1:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -680,7 +677,7 @@ data:
             (built by rust-datetime)
         ref: 5a51c80b41d125e3dbd4bb3032620b5c0abaabc8 # rust-num-traits0.1-0.1.43-5.fc31
       rust-num_cpus:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -688,7 +685,7 @@ data:
           * rust-exa
         ref: 9fec5098b96e9803df65c367d24567d0ddf53b47 # rust-num_cpus-1.10.0-1.fc30
       rust-number_prefix:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -696,7 +693,7 @@ data:
           * rust-exa
         ref: 407919bd6ee55e4e10fb8ab1f7b93209191be472 # rust-number_prefix-0.2.8-4.fc30
       rust-pad:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -708,7 +705,7 @@ data:
             (built by rust-datetime)
         ref: 556500ebd723622bfbc5ca7de08f12c105c174ad # rust-pad-0.1.5-4.fc30
       rust-regex-syntax:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -718,9 +715,9 @@ data:
           Required by:
           * rust-regex-devel
             (built by rust-regex)
-        ref: 9563466f81e609018817e7db23e1d2d6d110885a # rust-regex-syntax-0.6.5-2.fc30
+        ref: 0b2634c7c2a106884898b344d42a1995098287f0 # rust-regex-syntax-0.6.6-1.fc31
       rust-semver:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -732,7 +729,7 @@ data:
             (built by rust-rustc_version)
         ref: c6b7210fce440b9e2b2f8f489d49af557c023ae7 # rust-semver-0.9.0-8.fc31
       rust-term_grid:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -740,7 +737,7 @@ data:
           * rust-exa
         ref: d15be7adb6a7e17cbad72f600bc2efe3d6f329a1 # rust-term_grid-0.1.7-4.fc30
       rust-term_size:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -748,7 +745,7 @@ data:
           * rust-exa
         ref: de4b5679e89e08877fe80cd541781a0e8ff4afe8 # rust-term_size-0.3.1-7.fc30
       rust-thread_local:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -760,7 +757,7 @@ data:
             (built by rust-regex)
         ref: 203b239665653ad710d5dc0f750bfe691b3054f1 # rust-thread_local-0.3.6-4.fc30
       rust-unicode-bidi:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -772,7 +769,7 @@ data:
             (built by rust-idna)
         ref: e7e9c6c03dc86f7d21597ff8e6e780fd2626c315 # rust-unicode-bidi-0.3.4-8.fc31
       rust-unicode-normalization:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -784,7 +781,7 @@ data:
             (built by rust-idna)
         ref: c29ca70068f7d9723e2c8199cdd37f22ebeee74a # rust-unicode-normalization-0.1.8-2.fc30
       rust-users:
-        buildorder: 20
+        buildorder: 10
         rationale: |-
           Dependency of other components.
 
@@ -792,7 +789,7 @@ data:
           * rust-exa
         ref: d0d437c0cd19ff688129c8a58f568383fc5eb9cf # rust-users-0.7.0-4.fc30
       rust-idna:
-        buildorder: 30
+        buildorder: 20
         rationale: |-
           Dependency of other components.
 
@@ -804,7 +801,7 @@ data:
             (built by rust-url)
         ref: b2fe751e5d267e82c63bddcb52492ab8181ab768 # rust-idna-0.1.5-4.fc30
       rust-iso8601:
-        buildorder: 30
+        buildorder: 20
         rationale: |-
           Dependency of other components.
 
@@ -816,7 +813,7 @@ data:
             (built by rust-datetime)
         ref: 2a0cd60e16e47a5fb2dc0a55db04c29ae864439c # rust-iso8601-0.3.0-1.fc30
       rust-libgit2-sys:
-        buildorder: 30
+        buildorder: 20
         rationale: |-
           Dependency of other components.
 
@@ -828,7 +825,7 @@ data:
             (built by rust-git2)
         ref: 1973930794b259011d33026245a115692ed1e38f # rust-libgit2-sys-0.7.11-5.fc31
       rust-regex:
-        buildorder: 30
+        buildorder: 20
         rationale: |-
           Dependency of other components.
 
@@ -838,9 +835,9 @@ data:
           Required by:
           * rust-env_logger+default-devel
             (built by rust-env_logger)
-        ref: 3b32c066c90d665594c7ff75476d31c78ef7c132 # rust-regex-1.1.2-1.fc31
+        ref: d1396d0a0c3ec97c542e78cd3470220ef8fd42cd # rust-regex-1.1.6-1.fc31
       rust-rustc_version:
-        buildorder: 30
+        buildorder: 20
         rationale: |-
           Dependency of other components.
 
@@ -852,7 +849,7 @@ data:
             (built by rust-openssl-sys)
         ref: ca4603e4a52064674282104f297dd25dc12f909e # rust-rustc_version-0.2.3-4.fc30
       rust-datetime:
-        buildorder: 40
+        buildorder: 30
         rationale: |-
           Dependency of other components.
 
@@ -865,7 +862,7 @@ data:
             (built by rust-zoneinfo_compiled)
         ref: 2148ca6d51033d7038d2b619f30cca927c7cd7c8 # rust-datetime-0.4.7-6.fc30
       rust-env_logger:
-        buildorder: 40
+        buildorder: 30
         rationale: |-
           Dependency of other components.
 
@@ -873,7 +870,7 @@ data:
           * rust-exa
         ref: 73fd31cc91007dbbd0dd91d212c913cd33bd52ad # rust-env_logger-0.6.1-1.fc31
       rust-openssl-sys:
-        buildorder: 40
+        buildorder: 30
         rationale: |-
           Dependency of other components.
 
@@ -889,9 +886,9 @@ data:
             (built by rust-libgit2-sys)
           * rust-libssh2-sys-devel
             (built by rust-libssh2-sys)
-        ref: ade075394809591ac29f8cb6aed1f8dee0b86e53 # rust-openssl-sys-0.9.42-2.fc31
+        ref: fc2a0da0c26a9b0f0efd5b09edb519b76d267007 # rust-openssl-sys-0.9.43-1.fc31
       rust-url:
-        buildorder: 40
+        buildorder: 30
         rationale: |-
           Dependency of other components.
 
@@ -903,7 +900,7 @@ data:
             (built by rust-git2)
         ref: b259e34417267000954a3cf6c878e66851ddb4d4 # rust-url-1.7.2-3.fc31
       rust-curl-sys:
-        buildorder: 50
+        buildorder: 40
         rationale: |-
           Dependency of other components.
 
@@ -912,7 +909,7 @@ data:
             (built by rust-libgit2-sys)
         ref: 8d669738cdc895f107d71a84e49afe3fa9b2fc35 # rust-curl-sys-0.4.17-1.fc31
       rust-libssh2-sys:
-        buildorder: 50
+        buildorder: 40
         rationale: |-
           Dependency of other components.
 
@@ -921,7 +918,7 @@ data:
             (built by rust-libgit2-sys)
         ref: ec6a9668eef35e537ae2f3f6d0f4ff857884cf94 # rust-libssh2-sys-0.2.11-4.fc30
       rust-zoneinfo_compiled:
-        buildorder: 50
+        buildorder: 40
         rationale: |-
           Dependency of other components.
 
@@ -929,7 +926,7 @@ data:
           * rust-exa
         ref: 2dc0f04273b9a5d71aefa7622a7fe0d2aa5cb9d5 # rust-zoneinfo_compiled-0.4.7-6.fc30
       rust-git2:
-        buildorder: 60
+        buildorder: 50
         rationale: |-
           Dependency of other components.
 
@@ -937,6 +934,6 @@ data:
           * rust-exa
         ref: 9986766cf5996f5543acb498f921fcf0b8c7a5b0 # rust-git2-0.8.0-1.fc30
       rust-exa:
-        buildorder: 70
+        buildorder: 60
         rationale: Main component.
-        ref: latest
+        ref: 4a44a5786c65036216f8c81b11a8e26d678135b1 # rust-exa-0.8.0-13.fc31