diff --git a/setup.py b/setup.py
index 4554ca22617150b6f3c78599eb556d02ace58562..029d76d6730e1a73b71e9784a3289e866b937681 100644
--- a/setup.py
+++ b/setup.py
@@ -95,22 +95,23 @@ setup(
         # scripts should be declared using this entry:
         "console_scripts": [],
         "bob.bio.database": [
-            "arface            = bob.bio.face.config.database.arface:database",
-            "atnt              = bob.bio.face.config.database.atnt:database",
-            "gbu               = bob.bio.face.config.database.gbu:database",
-            "ijbc-11              = bob.bio.face.config.database.ijbc:database",
-            "lfw-restricted    = bob.bio.face.config.database.lfw_restricted:database",
-            "lfw-unrestricted  = bob.bio.face.config.database.lfw_unrestricted:database",
-            "mobio-male       = bob.bio.face.config.database.mobio_male:database",
-            "mobio-all        = bob.bio.face.config.database.mobio_all:database",
-            "multipie          = bob.bio.face.config.database.multipie:database",
-            "multipie-pose     = bob.bio.face.config.database.multipie_pose:database",
-            "replaymobile-img  = bob.bio.face.config.database.replaymobile:database",
-            "fargo  = bob.bio.face.config.database.fargo:database",
-            "meds = bob.bio.face.config.database.meds:database",
-            "morph = bob.bio.face.config.database.morph:database",
-            "casia-africa = bob.bio.face.config.database.casia_africa:database",
-            "rfw = bob.bio.face.config.database.rfw:database",
+            "arface                   = bob.bio.face.config.database.arface:database",
+            "atnt                     = bob.bio.face.config.database.atnt:database",
+            "casia-africa             = bob.bio.face.config.database.casia_africa:database",
+            "fargo                    = bob.bio.face.config.database.fargo:database",
+            "gbu                      = bob.bio.face.config.database.gbu:database",
+            "ijbc-11                  = bob.bio.face.config.database.ijbc:database",
+            "lfw-restricted           = bob.bio.face.config.database.lfw_restricted:database",
+            "lfw-unrestricted         = bob.bio.face.config.database.lfw_unrestricted:database",
+            "meds                     = bob.bio.face.config.database.meds:database",
+            "mobio-all                = bob.bio.face.config.database.mobio_all:database",
+            "mobio-male               = bob.bio.face.config.database.mobio_male:database",
+            "morph                    = bob.bio.face.config.database.morph:database",
+            "multipie                 = bob.bio.face.config.database.multipie:database",
+            "multipie-pose            = bob.bio.face.config.database.multipie_pose:database",
+            "pola-thermal             = bob.bio.face.config.database.pola_thermal:database",
+            "replaymobile-img         = bob.bio.face.config.database.replaymobile:database",
+            "rfw                      = bob.bio.face.config.database.rfw:database",
         ],
         "bob.bio.annotator": [
             "facedetect               = bob.bio.face.config.annotator.facedetect:annotator",
@@ -121,61 +122,64 @@ setup(
         ],
         # baselines
         "bob.bio.pipeline": [
-            "facenet-sanderberg = bob.bio.face.config.baseline.facenet_sanderberg:pipeline",
-            "inception-resnetv1-casiawebface = bob.bio.face.config.baseline.inception_resnetv1_casiawebface:pipeline",
-            "inception-resnetv2-casiawebface = bob.bio.face.config.baseline.inception_resnetv2_casiawebface:pipeline",
-            "inception-resnetv1-msceleb = bob.bio.face.config.baseline.inception_resnetv1_msceleb:pipeline",
-            "inception-resnetv2-msceleb = bob.bio.face.config.baseline.inception_resnetv2_msceleb:pipeline",
-            "gabor_graph = bob.bio.face.config.baseline.gabor_graph:pipeline",
-            "arcface-insightface = bob.bio.face.config.baseline.arcface_insightface:pipeline",
-            "lgbphs = bob.bio.face.config.baseline.lgbphs:pipeline",
-            "lda = bob.bio.face.config.baseline.lda:pipeline",
-            "dummy = bob.bio.face.config.baseline.dummy:pipeline",
-            "resnet50-msceleb-arcface-2021 = bob.bio.face.config.baseline.resnet50_msceleb_arcface_2021:pipeline",
-            "resnet50-msceleb-arcface-20210521 = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521:pipeline",
-            "resnet50-vgg2-arcface-2021 = bob.bio.face.config.baseline.resnet50_vgg2_arcface_2021:pipeline",
-            "mobilenetv2-msceleb-arcface-2021 = bob.bio.face.config.baseline.mobilenetv2_msceleb_arcface_2021:pipeline",
-            "afffe = bob.bio.face.config.baseline.afffe:pipeline",
-            "vgg16-oxford = bob.bio.face.config.baseline.vgg16_oxford:pipeline",
-            "iresnet34 = bob.bio.face.config.baseline.iresnet34:pipeline",
-            "iresnet50 = bob.bio.face.config.baseline.iresnet50:pipeline",
-            "iresnet100 = bob.bio.face.config.baseline.iresnet100:pipeline",
+            "afffe                                 = bob.bio.face.config.baseline.afffe:pipeline",
+            "arcface-insightface                   = bob.bio.face.config.baseline.arcface_insightface:pipeline",
+            "dummy                                 = bob.bio.face.config.baseline.dummy:pipeline",
+            "facenet-sanderberg                    = bob.bio.face.config.baseline.facenet_sanderberg:pipeline",
+            "gabor_graph                           = bob.bio.face.config.baseline.gabor_graph:pipeline",
+            "inception-resnetv1-casiawebface       = bob.bio.face.config.baseline.inception_resnetv1_casiawebface:pipeline",
+            "inception-resnetv1-msceleb            = bob.bio.face.config.baseline.inception_resnetv1_msceleb:pipeline",
+            "inception-resnetv2-casiawebface       = bob.bio.face.config.baseline.inception_resnetv2_casiawebface:pipeline",
+            "inception-resnetv2-msceleb            = bob.bio.face.config.baseline.inception_resnetv2_msceleb:pipeline",
+            "iresnet100                            = bob.bio.face.config.baseline.iresnet100:pipeline",
+            "iresnet34                             = bob.bio.face.config.baseline.iresnet34:pipeline",
+            "iresnet50                             = bob.bio.face.config.baseline.iresnet50:pipeline",
+            "lda                                   = bob.bio.face.config.baseline.lda:pipeline",
+            "lgbphs                                = bob.bio.face.config.baseline.lgbphs:pipeline",
+            "mobilenetv2-msceleb-arcface-2021      = bob.bio.face.config.baseline.mobilenetv2_msceleb_arcface_2021:pipeline",
+            "resnet50-msceleb-arcface-2021         = bob.bio.face.config.baseline.resnet50_msceleb_arcface_2021:pipeline",
+            "resnet50-msceleb-arcface-20210521     = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521:pipeline",
+            "resnet50-vgg2-arcface-2021            = bob.bio.face.config.baseline.resnet50_vgg2_arcface_2021:pipeline",
+            "vgg16-oxford                          = bob.bio.face.config.baseline.vgg16_oxford:pipeline",
         ],
         "bob.bio.config": [
-            "facenet-sanderberg = bob.bio.face.config.baseline.facenet_sanderberg",
-            "inception-resnetv1-casiawebface = bob.bio.face.config.baseline.inception_resnetv1_casiawebface",
-            "inception-resnetv2-casiawebface = bob.bio.face.config.baseline.inception_resnetv2_casiawebface",
-            "inception-resnetv1-msceleb = bob.bio.face.config.baseline.inception_resnetv1_msceleb",
-            "inception-resnetv2-msceleb = bob.bio.face.config.baseline.inception_resnetv2_msceleb",
-            "gabor_graph = bob.bio.face.config.baseline.gabor_graph",
-            "arcface-insightface = bob.bio.face.config.baseline.arcface_insightface",
-            "lgbphs = bob.bio.face.config.baseline.lgbphs",
-            "lda = bob.bio.face.config.baseline.lda",
-            "afffe = bob.bio.face.config.baseline.afffe",
-            "vgg16-oxford = bob.bio.face.config.baseline.vgg16_oxford",
-            "arface            = bob.bio.face.config.database.arface",
-            "atnt              = bob.bio.face.config.database.atnt",
-            "gbu               = bob.bio.face.config.database.gbu",
-            "ijbc-11              = bob.bio.face.config.database.ijbc",
-            "lfw-restricted    = bob.bio.face.config.database.lfw_restricted",
-            "lfw-unrestricted  = bob.bio.face.config.database.lfw_unrestricted",
-            "mobio-male       = bob.bio.face.config.database.mobio_male",
-            "mobio-all        = bob.bio.face.config.database.mobio_all",
-            "multipie          = bob.bio.face.config.database.multipie",
-            "multipie-pose     = bob.bio.face.config.database.multipie_pose",
-            "replaymobile-img  = bob.bio.face.config.database.replaymobile",
-            "fargo  = bob.bio.face.config.database.fargo",
-            "meds = bob.bio.face.config.database.meds",
-            "rfw = bob.bio.face.config.database.rfw",
-            "casia-africa = bob.bio.face.config.database.casia_africa",
-            "morph = bob.bio.face.config.database.morph",
-            "resnet50-msceleb-arcface-2021 = bob.bio.face.config.baseline.resnet50_msceleb_arcface_2021",
-            "resnet50-msceleb-arcface-20210521 = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521:pipeline",
-            "resnet50-vgg2-arcface-2021 = bob.bio.face.config.baseline.resnet50_vgg2_arcface_2021",
-            "mobilenetv2-msceleb-arcface-2021 = bob.bio.face.config.baseline.mobilenetv2_msceleb_arcface_2021",
-            "iresnet34 = bob.bio.face.config.baseline.iresnet34",
-            "iresnet50 = bob.bio.face.config.baseline.iresnet50",
-            "iresnet100 = bob.bio.face.config.baseline.iresnet100",
+            # pipelines
+            "afffe                                 = bob.bio.face.config.baseline.afffe",
+            "arcface-insightface                   = bob.bio.face.config.baseline.arcface_insightface",
+            "facenet-sanderberg                    = bob.bio.face.config.baseline.facenet_sanderberg",
+            "gabor_graph                           = bob.bio.face.config.baseline.gabor_graph",
+            "inception-resnetv1-casiawebface       = bob.bio.face.config.baseline.inception_resnetv1_casiawebface",
+            "inception-resnetv1-msceleb            = bob.bio.face.config.baseline.inception_resnetv1_msceleb",
+            "inception-resnetv2-casiawebface       = bob.bio.face.config.baseline.inception_resnetv2_casiawebface",
+            "inception-resnetv2-msceleb            = bob.bio.face.config.baseline.inception_resnetv2_msceleb",
+            "iresnet100                            = bob.bio.face.config.baseline.iresnet100",
+            "iresnet34                             = bob.bio.face.config.baseline.iresnet34",
+            "iresnet50                             = bob.bio.face.config.baseline.iresnet50",
+            "lda                                   = bob.bio.face.config.baseline.lda",
+            "lgbphs                                = bob.bio.face.config.baseline.lgbphs",
+            "mobilenetv2-msceleb-arcface-2021      = bob.bio.face.config.baseline.mobilenetv2_msceleb_arcface_2021",
+            "resnet50-msceleb-arcface-2021         = bob.bio.face.config.baseline.resnet50_msceleb_arcface_2021",
+            "resnet50-msceleb-arcface-20210521     = bob.bio.face.config.baseline.resnet50_msceleb_arcface_20210521:pipeline",
+            "resnet50-vgg2-arcface-2021            = bob.bio.face.config.baseline.resnet50_vgg2_arcface_2021",
+            "vgg16-oxford                          = bob.bio.face.config.baseline.vgg16_oxford",
+            # databases
+            "arface                                = bob.bio.face.config.database.arface",
+            "atnt                                  = bob.bio.face.config.database.atnt",
+            "casia-africa                          = bob.bio.face.config.database.casia_africa",
+            "fargo                                 = bob.bio.face.config.database.fargo",
+            "gbu                                   = bob.bio.face.config.database.gbu",
+            "ijbc-11                               = bob.bio.face.config.database.ijbc",
+            "lfw-restricted                        = bob.bio.face.config.database.lfw_restricted",
+            "lfw-unrestricted                      = bob.bio.face.config.database.lfw_unrestricted",
+            "meds                                  = bob.bio.face.config.database.meds",
+            "mobio-all                             = bob.bio.face.config.database.mobio_all",
+            "mobio-male                            = bob.bio.face.config.database.mobio_male",
+            "morph                                 = bob.bio.face.config.database.morph",
+            "multipie                              = bob.bio.face.config.database.multipie",
+            "multipie-pose                         = bob.bio.face.config.database.multipie_pose",
+            "pola-thermal                          = bob.bio.face.config.database.pola_thermal:database",
+            "replaymobile-img                      = bob.bio.face.config.database.replaymobile",
+            "rfw                                   = bob.bio.face.config.database.rfw:database",
         ],
         "bob.bio.cli": [
             "display-face-annotations          = bob.bio.face.script.display_face_annotations:display_face_annotations",