diff --git a/X11-base.yaml b/X11-base.yaml
index fa8068a..d1a30bb 100644
--- a/X11-base.yaml
+++ b/X11-base.yaml
@@ -2,17 +2,17 @@ document: modulemd
 version: 1
 data:
     summary: X11-base module
-    description: Xorg server and basic X11 libraries
+    description: Xorg server and basic X11 libraries.
     license:
         module:
             - MIT
     dependencies:
         buildrequires:
-            bootstrap: f27
+            bootstrap: master
         requires:
-            platform: f27
-            fonts: f27
-            autotools: f27
+            platform: master
+            fonts: master
+            autotools: master
     references:
         community: https://github.com/modularity-modules/X11-base
         documentation: https://github.com/modularity-modules/X11-base
@@ -63,7 +63,7 @@ data:
             - libXxf86vm
             - pixman
             - mesa-libGL
-            - wayland 
+            - wayland
             - xcb-util
             - xkeyboard-config
             - xorg-x11-drivers
@@ -151,7 +151,7 @@ data:
                 - libXxf86misc
                 - libXxf86vm
                 - mesa-libGL
-                - wayland 
+                - wayland
                 - xcb-util
                 - xkeyboard-config
                 - xorg-x11-drivers
@@ -194,252 +194,340 @@ data:
                 - xorg-x11-xtrans-devel
     components:
         rpms:
+            # gphoto2-2.5.14-3.fc27
+            gphoto2:
+                rationale: build requirement for umockdev.
+                ref: bc40ed73a66f48972a33ef8ab73d67d20daaf9b0
+                buildorder: -5
+            # iso-codes-3.76-1.fc28
             iso-codes:
                 rationale: Generated.
-                ref: 3e743ad6c58ae4d75385007ae24c801db747f2a2
+                ref: 9f5d68dff2a26f844e69eaa4b5482fa7cc71a07e
+            # libdmx-1.1.3-9.fc27
             libdmx:
                 rationale: Generated.
                 ref: b8330f1b4752934b789ee918f03503bcfcfde3b2
+            # libdrm-2.4.84-2.fc28
             libdrm:
                 rationale: Generated.
-                ref: e4479f5b82f8aec489b6615e45e4b9d3ea10cca1
+                ref: dc256402ee1e6a7bb0d0272346abf4928928e8d6
+            # libepoxy-1.4.3-4.fc28
             libepoxy:
                 rationale: Generated.
-                ref: a4cf6e99f7efd72d18e3fb5d7bc2105349e8d4bf
+                ref: cc29d8f03c6f17753246aab39d573c0ef2c5eeea
+            # libevdev-1.5.7-3.fc27
             libevdev:
                 rationale: Generated.
                 ref: b26c69e49ac39452eeae40d2842649ba57c9c21a
+            # libfontenc-1.1.3-6.fc27
             libfontenc:
                 rationale: Generated.
                 ref: ba00758ca8efc98c2126e522bd4f8f28b4fbdb02
+            # libglvnd-0.2.999-24.20170818git8d4d03f.fc28
             libglvnd:
                 rationale: core component of this module.
-                ref: f27
+                ref: 4410f00b64c9e4f8729d743d4b51b8dbb44b63b2
+            # libgudev-232-1.fc28
             libgudev:
                 rationale: Generated.
-                ref: 0daa2d6bc8fb19b45d1adf7612a3297715c643ae
+                ref: f9cb11e4171b3696d4b275d15c2df5089054f33f
+            # libICE-1.0.9-11.fc27
             libICE:
                 rationale: core component of this module.
                 ref: 85b2cedab6a1a87bdc08c30d263b71ba181037ab
+            # libinput-1.9.0-1.fc28
             libinput:
                 rationale: core component of this module.
-                ref: 1b06234a8d1d43c211c7e34fdbc80f4a01361316
+                ref: 16249394c50d2d18d0675b39df96b321af17e7b5
+            # libSM-1.2.2-7.fc27
             libSM:
                 rationale: core component of this module.
                 ref: 0c121c8da66253539506ffb8b78b938d57af7198
+            # libvdpau-1.1.1-6.fc28
             libvdpau:
                 rationale: core component of this module.
-                ref: 2b00e071fe4593757ad36d844c1893cda4d77b7c
+                ref: 3500f7f4d0603f33ce2120fad3d9a9f9530939a2
+            # libwacom-0.26-2.fc28
             libwacom:
                 rationale: Generated.
-                ref: 9bed6371d8e5942cf5f0ca12dc388f0c509eb825
+                ref: 44fa672818bf031a0966a15948fc50b6e720d478
+            # libX11-1.6.5-5.fc28
             libX11:
                 rationale: core component of this module.
-                ref: b6693a0e3d73012d13fb4602fafc462784da03ca
+                ref: ff2b36327886705dfbc7b65eac0aa5dcbfccfec1
                 buildorder: -1
+            # libXau-1.0.8-9.fc27
             libXau:
                 rationale: core component of this module.
                 ref: 7acd9c1dca3a814086898044ac226cb7bdaf4b9f
                 buildorder: -5
+            # libXaw-1.0.13-7.fc27
             libXaw:
                 rationale: core component of this module.
                 ref: 4c9eb98df8d0f8bda198b874cd8e3f20d5ed27d0
+            # libxcb-1.12-5.fc27
             libxcb:
                 rationale: Generated.
                 ref: b14cc088efdbcdc9c9d10248c4729b92504837d1
                 buildorder: -4
+            # libXcomposite-0.4.4-11.fc27
             libXcomposite:
                 rationale: core component of this module.
                 ref: bed504bb2f3a31942e1b8c867ed8eea549078712
                 buildorder: 5
+            # libXcursor-1.1.14-10.fc27
             libXcursor:
                 rationale: core component of this module.
                 ref: 7e426c67e59781bc90afd0c2ae225eb45ea49b9b
+            # libXdamage-1.1.4-11.fc27
             libXdamage:
                 rationale: core component of this module.
                 ref: 01caab1c6857813174ce6248dd576cb9208c456a
+            # libXdmcp-1.1.2-8.fc27
             libXdmcp:
                 rationale: core component of this module.
                 ref: dc4b76496caefbd8193ae8bd110bea257820aff2
                 buildorder: -8
+            # libXext-1.3.3-7.fc27
             libXext:
                 rationale: core component of this module.
                 ref: 79b649ceeca9aeb62e76d660c82b6baa6bbb6564
+            # libXfixes-5.0.3-4.fc27
             libXfixes:
                 rationale: core component of this module.
                 ref: a1343677164423634bce24b22dc07565e4e94788
+            # libXfont-1.5.2-5.fc28
             libXfont:
                 rationale: core component of this module.
-                ref: dde10537632e5fa1b1f73a4141cd99223f0d040e
+                ref: 373f9aab0a5449659cc2138cda887d497f203616
+            # libXfont2-2.0.2-1.fc28
             libXfont2:
                 rationale: core component of this module.
-                ref: 8056a79a9521ecb54ffd44cd552c083d21b9e69b
+                ref: cc1a8f3aad651b40f98a58be6890582129452268
                 buildorder: 5
+            # libXft-2.3.2-7.fc27
             libXft:
                 rationale: core component of this module.
                 ref: 8eb00995406e13fd1047ebc040179e06556af16c
+            # libXi-1.7.9-4.fc27
             libXi:
                 rationale: core component of this module.
                 ref: 7438720cb338a248896140a2dcc75d5934de4a45
+            # libXinerama-1.1.3-9.fc27
             libXinerama:
                 rationale: core component of this module.
                 ref: 62a767cc4b25392cf8a19743048a1eab76f94ee3
+            # libxkbcommon-0.7.1-5.fc27
             libxkbcommon:
                 rationale: Generated.
                 ref: 6cc39866250e966a0bbd0842adf31166ae8307e3
+            # libxkbfile-1.0.9-6.fc27
             libxkbfile:
                 rationale: Generated.
                 ref: a8c10d76a38dc6546f9ac2065caf9ff976a7e747
+            # libxklavier-5.4-9.fc27
             libxklavier:
                 rationale: Generated.
                 ref: 4ffc50e46bf165998c40f8e260eaa72a3c88d013
+            # libXmu-1.1.2-7.fc27
             libXmu:
                 rationale: core component of this module.
                 ref: e3c5851ed9b18c445fe9d6c89b2cd326c599ca5c
+            # libXpm-3.5.12-4.fc27
             libXpm:
                 rationale: core component of this module.
                 ref: 3822ff8453707cb9165359faa15586cc1e15104f
+            # libXrandr-1.5.1-4.fc27
             libXrandr:
                 rationale: core component of this module.
                 ref: baa8e966607953b319637558358f954440d5246f
+            # libXrender-0.9.10-4.fc27
             libXrender:
                 rationale: core component of this module.
                 ref: 03e84decd61496c1c549084f03e3f3f69957d94c
+            # libxshmfence-1.2-6.fc27
             libxshmfence:
                 rationale: Generated.
                 ref: 878b8caaf7e0b40fa5d73cee882738556442d3d4
+            # libXt-1.1.5-6.fc27
             libXt:
                 rationale: core component of this module.
                 ref: 47010fa9d287593f1cd2432026539cc0e35f772d
+            # libXtst-1.2.3-4.fc27
             libXtst:
                 rationale: core component of this module.
                 ref: 65c22321858ff24e424330c166ed08ff0779419d
+            # libXv-1.0.11-4.fc27
             libXv:
                 rationale: core component of this module.
                 ref: 1ebb0f47c03817757117698a8b4779f388bced1e
+            # libXvMC-1.0.10-4.fc27
             libXvMC:
                 rationale: Generated.
                 ref: 16b6ee19c8baa1c044b08347870393c91f7a67e6
+            # libXxf86misc-1.0.3-14.fc27
             libXxf86misc:
                 rationale: Generated.
                 ref: fa818cfe1b5488bbac73423230904165c6681ef6
+                buildorder: 5
+            # libXxf86vm-1.1.4-6.fc27
             libXxf86vm:
                 rationale: Generated.
                 ref: caf55eb834080e0ed060474734ca6b85b681443f
                 buildorder: 5
+            # llvm-4.0.1-6.fc28
             llvm:
-                rationale: Generated.
-                ref: cca2af2d0742e0b0944468bb7ca725a6c21840da
+                rationale: core component of this module.
+                ref: ca4631e1f82de5be2b6b3ce5e0366c3a79cdf79b
+            # mcpp-2.7.2-19.fc27
             mcpp:
                 rationale: Generated.
                 ref: 46104c97b7b907c39d25fdbf38b846431a93ae27
+            # mesa-17.2.2-4.fc28
             mesa:
                 rationale: core component of this module.
-                ref: 674d9cd03cf606873eab84e7fdc1021f8406947d
+                ref: 8c5aa4596e0ac4d861dbbcbf65ff071d4262cbdd
                 buildorder: 10
+            # mozjs17-17.0.0-21.fc27
             mozjs17:
                 rationale: Generated.
                 ref: a9a7a5d4acec661da4462519be9cc3778f408dfe
+            # mtdev-1.1.5-9.fc27
             mtdev:
                 rationale: Generated.
                 ref: 1c4ed456216a9a26518e04fdca989565290b0317
+            # pixman-0.34.0-3.fc26
             pixman:
                 rationale: Generated.
                 ref: a5d85027d0f231fc39a02e1065fe9e39e991fb76
+            # polkit-pkla-compat-0.1-10.fc27
             polkit-pkla-compat:
                 rationale: Generated.
                 ref: dd70952465cd82d411966bfbd9c6d718926582e5
+            # umockdev-0.9.2-1.fc27
+            umockdev:
+                rationale: Generated.
+                ref: 5701ee60463b38cb18f1baa8f8f136562bd3887a
+                buildorder: -1
+            # wayland-1.14.0-1.fc27
             wayland:
                 rationale: Generated.
                 ref: a80cb1c29bace7a333b554f25d8349d841b57f96
+            # xcb-util-0.4.0-8.fc27
             xcb-util:
                 rationale: Generated.
                 ref: ef4f0b00516e0a1aa062625a6d4276fdc967414f
+            # xkeyboard-config-2.22-1.fc28
             xkeyboard-config:
                 rationale: Generated.
                 ref: a14f0889b6253d390cd0bd733a3af0234b5ab05a
+            # xorg-x11-drv-amdgpu-1.4.0-1.fc28
             xorg-x11-drv-amdgpu:
                 rationale: core component of this module.
-                ref: f0c03e3724681af5f716debf4ca80d0d3401192e
+                ref: cd2f555bf2cde72110dac1daf2b248fd8b1777e5
+            # xorg-x11-drv-ati-7.9.0-3.fc27
             xorg-x11-drv-ati:
                 rationale: core component of this module.
                 ref: d662fe531c3d24ea45ceeb67e33432b2c12b81ca
+            # xorg-x11-drv-dummy-0.3.7-5.fc27
             xorg-x11-drv-dummy:
                 rationale: core component of this module.
                 ref: 10bd101e65b278368a33c413203a3fcedec29c66
+            # xorg-x11-drv-evdev-2.10.5-4.fc27
             xorg-x11-drv-evdev:
                 rationale: core component of this module.
                 ref: 98340c3eb0b0ab3951a88d94d892133f8dbaf4f9
+            # xorg-x11-drv-fbdev-0.4.3-28.fc27
             xorg-x11-drv-fbdev:
                 rationale: core component of this module.
                 ref: 2f3d8945316944918e7c3b23cd3b1fc668034710
+            # xorg-x11-drv-fbturbo-0.5.1-0.11.20150221.fc27
             xorg-x11-drv-fbturbo:
                 rationale: core component of this module.
                 ref: a71fec271cd54dee580921463bdba8d145765bf9
             xorg-x11-drv-geode:
                 rationale: core component of this module.
-                arch: i686
+                arches: [ i686 ]
                 ref: 507210498fb105731a11251ff0a7e446a040c97a
                 buildorder: 10
+            # xorg-x11-drv-intel-2.99.917-31.20171025.fc28
             xorg-x11-drv-intel:
                 rationale: core component of this module.
-                ref: d00792d54161aa50501420a3e8d37cfb8f980a45
+                ref: d830c9b8da73e5a814c7be9382bafbc2775d8982
                 buildorder: 5
+            # xorg-x11-drv-ivtv-1.2.0-0.25.fc27
             xorg-x11-drv-ivtv:
                 rationale: core component of this module.
                 ref: 618ffbcdc9fdeab71eec2871ad462a41e62752d5
+            # xorg-x11-drv-libinput-0.26.0-1.fc28
             xorg-x11-drv-libinput:
                 rationale: core component of this module.
-                ref: b6a7c8448bec1ef212e2089f3869e46e132710d1
+                ref: 4e4cb0d47fcb31da40107053bd9abe5fbd357e94
+            # xorg-x11-drv-nouveau-1.0.15-3.fc27
             xorg-x11-drv-nouveau:
                 rationale: core component of this module.
-                ref: f27
+                ref: 65889e345d7f6b0c2e288a02112264fc83979e93
+            # xorg-x11-drv-openchrome-0.6.0-3.fc27
             xorg-x11-drv-openchrome:
                 rationale: core component of this module.
                 ref: 4265e027bc189dd2fb3c1b9bf706fea7fe8f0ba7
                 buildorder: 5
+            # xorg-x11-drv-qxl-0.1.5-5.fc27
             xorg-x11-drv-qxl:
                 rationale: core component of this module.
                 ref: 9dc6dc5af4002cc22f679d1872e17d6b44c8496a
+            # xorg-x11-drv-sisusb-0.9.6-27.fc27
             xorg-x11-drv-sisusb:
                 rationale: core component of this module.
                 ref: 836450cbc5644f5a7a28c71c936c2b48ea7896d8
+            # xorg-x11-drv-v4l-0.2.0-50.fc27
             xorg-x11-drv-v4l:
                 rationale: core component of this module.
                 ref: f816ed59339c732cf7c77c92df85b0ce0a582c24
+            # xorg-x11-drv-vesa-2.3.2-28.fc27
             xorg-x11-drv-vesa:
                 rationale: core component of this module.
                 ref: 988e2c8b4a5484818558d7a49d5d267b0224c2a2
+            # xorg-x11-drv-vmware-13.2.1-4.fc27
             xorg-x11-drv-vmware:
                 rationale: core component of this module.
                 ref: d130c3c9711345b481adfee6ade26f7e1193e462
+            # xorg-x11-drv-voodoo-1.2.5-28.fc27
             xorg-x11-drv-voodoo:
                 rationale: core component of this module.
                 ref: 539b6cf6bd32c20f65a0ece82d5bfd16e59609ed
+            # xorg-x11-drv-wacom-0.35.0-3.fc27
             xorg-x11-drv-wacom:
                 rationale: core component of this module.
                 ref: 995dd223378ce2807aeb0b6ac89ef1ffada9b4af
+            # xorg-x11-proto-devel-7.7-23.fc27
             xorg-x11-proto-devel:
                 rationale: core component of this module.
                 ref: c3322598a29db4bc5f1705658ec33c1907316784
                 buildorder: -10
+            # xorg-x11-server-1.19.5-1.fc28
             xorg-x11-server:
                 rationale: core component of this module.
-                ref: 78f536200b62ab1a9b20a36169a2029e8a5c9667
+                ref: c56aef5952e6a75d7cc0418f2823d62e6b17e27c
+            # xorg-x11-server-utils-7.7-23.fc27
             xorg-x11-server-utils:
                 rationale: core component of this module.
                 ref: 123ff0dabf11a6b3b96829db2e51618d916037ee
+            # xorg-x11-twm-1.0.9-6.fc27
             xorg-x11-twm:
                 rationale: basic window manager.
                 ref: 778e271a4a9322245163a28cf8cd8562fa59b9d0
                 buildorder: 10
+            # xorg-x11-util-macros-1.19.0-7.fc27
             xorg-x11-util-macros:
                 rationale: core component of this module.
                 ref: 746d43a5c9d8da8b4879c8f8cf9404c872715470
                 buildorder: -15
+            # xorg-x11-xkb-utils-7.7-21.fc27
             xorg-x11-xkb-utils:
                 rationale: core component of this module.
                 ref: e760ad84d68ccda36a263fde2891e72da47e8112
+            # xorg-x11-xtrans-devel-1.3.5-5.fc27
             xorg-x11-xtrans-devel:
                 rationale: Generated.
                 ref: 62e3703040cb1691800bb1c4736226b549bcdc46