diff --git a/templates/configurators/addbox.com.hamlet b/templates/configurators/addbox.com.hamlet
index c6f2ca8074..e994838e72 100644
--- a/templates/configurators/addbox.com.hamlet
+++ b/templates/configurators/addbox.com.hamlet
@@ -17,9 +17,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Add repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Making repository ...
-  <div .modal-body>
-    <p>
-      Setting up your Box.com repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Making repository ...
+      <div .modal-body>
+        <p>
+          Setting up your Box.com repository. This could take a minute.
diff --git a/templates/configurators/adddrive/setupmodal.hamlet b/templates/configurators/adddrive/setupmodal.hamlet
index d78a0e8812..fb541d9054 100644
--- a/templates/configurators/adddrive/setupmodal.hamlet
+++ b/templates/configurators/adddrive/setupmodal.hamlet
@@ -1,7 +1,9 @@
 <div .modal .fade #setupmodal>
-  <div .modal-header>
-    <h3>
-      Setting up repository on removable drive.
-  <div .modal-body>
-    <p>
-      This may take a few minutes; do not remove the drive.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Setting up repository on removable drive.
+      <div .modal-body>
+        <p>
+          This may take a few minutes; do not remove the drive.
diff --git a/templates/configurators/addglacier.hamlet b/templates/configurators/addglacier.hamlet
index 44c9ec1297..00698bb35c 100644
--- a/templates/configurators/addglacier.hamlet
+++ b/templates/configurators/addglacier.hamlet
@@ -25,9 +25,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Add Glacier repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Making repository ...
-  <div .modal-body>
-    <p>
-      Setting up your Amazon Glacier repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Making repository ...
+      <div .modal-body>
+        <p>
+          Setting up your Amazon Glacier repository. This could take a minute.
diff --git a/templates/configurators/addia.hamlet b/templates/configurators/addia.hamlet
index 1f8fd9d328..c7e5e492a5 100644
--- a/templates/configurators/addia.hamlet
+++ b/templates/configurators/addia.hamlet
@@ -25,9 +25,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Add Internet Archive item
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Making item ...
-  <div .modal-body>
-    <p>
-      Setting up your Internet Archive item. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Making item ...
+      <div .modal-body>
+        <p>
+          Setting up your Internet Archive item. This could take a minute.
diff --git a/templates/configurators/adds3.hamlet b/templates/configurators/adds3.hamlet
index 10a84aac53..bfd65bb408 100644
--- a/templates/configurators/adds3.hamlet
+++ b/templates/configurators/adds3.hamlet
@@ -21,9 +21,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Add S3 repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Making repository ...
-  <div .modal-body>
-    <p>
-      Setting up your Amazon S3 repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Making repository ...
+      <div .modal-body>
+        <p>
+          Setting up your Amazon S3 repository. This could take a minute.
diff --git a/templates/configurators/enableaws.hamlet b/templates/configurators/enableaws.hamlet
index 3e036a30bb..8cfb7299bb 100644
--- a/templates/configurators/enableaws.hamlet
+++ b/templates/configurators/enableaws.hamlet
@@ -23,9 +23,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Enable Amazon repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Enabling repository ...
-  <div .modal-body>
-    <p>
-      Enabling this Amazon repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Enabling repository ...
+      <div .modal-body>
+        <p>
+          Enabling this Amazon repository. This could take a minute.
diff --git a/templates/configurators/enableia.hamlet b/templates/configurators/enableia.hamlet
index 8b5047895e..434e6f4907 100644
--- a/templates/configurators/enableia.hamlet
+++ b/templates/configurators/enableia.hamlet
@@ -15,9 +15,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Enable Internet Archive repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Enabling repository ...
-  <div .modal-body>
-    <p>
-      Enabling this Internet Archive repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Enabling repository ...
+      <div .modal-body>
+        <p>
+          Enabling this Internet Archive repository. This could take a minute.
diff --git a/templates/configurators/enablewebdav.hamlet b/templates/configurators/enablewebdav.hamlet
index d20b419bf7..66c3225210 100644
--- a/templates/configurators/enablewebdav.hamlet
+++ b/templates/configurators/enablewebdav.hamlet
@@ -15,9 +15,11 @@
             <button .btn .btn-primary type=submit onclick="$('#workingmodal').modal('show');">
               Enable repository
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Enabling repository ...
-  <div .modal-body>
-    <p>
-      Enabling this WebDAV repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Enabling repository ...
+      <div .modal-body>
+        <p>
+          Enabling this WebDAV repository. This could take a minute.
diff --git a/templates/configurators/genkeymodal.hamlet b/templates/configurators/genkeymodal.hamlet
index 71785de7f6..c7dc3aad94 100644
--- a/templates/configurators/genkeymodal.hamlet
+++ b/templates/configurators/genkeymodal.hamlet
@@ -1,12 +1,14 @@
 <div .modal .fade #genkeymodal>
   <div .modal-header>
-    <h3>
-      <img src="@{StaticR activityicon_gif}" alt=""> #
-      Generating a #{maxRecommendedKeySize} bit GnuPg key.
-  <div .modal-body>
-    <p>
-      Generating a GnuPg key can take a long time. To speed up the process, #
-      it actually helps to use your computer for other things, which helps #
-      generate random numbers that keep the GnuPg key secure.
-    <p>
-      So if this is taking too long, go play a game or something!
+    <div .modal-dialog>
+      <div .modal-content>
+        <h3>
+          <img src="@{StaticR activityicon_gif}" alt=""> #
+          Generating a #{maxRecommendedKeySize} bit GnuPg key.
+      <div .modal-body>
+        <p>
+          Generating a GnuPg key can take a long time. To speed up the process, #
+          it actually helps to use your computer for other things, which helps #
+          generate random numbers that keep the GnuPg key secure.
+        <p>
+          So if this is taking too long, go play a game or something!
diff --git a/templates/configurators/rsync.net/add.hamlet b/templates/configurators/rsync.net/add.hamlet
index 34a46e8b81..6e2afaef0a 100644
--- a/templates/configurators/rsync.net/add.hamlet
+++ b/templates/configurators/rsync.net/add.hamlet
@@ -31,11 +31,13 @@
             <button .btn .btn-primary type=submit onclick="$('#setupmodal').modal('show');">
               Use this rsync.net repository
 <div .modal .fade #setupmodal>
-  <div .modal-header>
-    <h3>
-      Checking access to rsync.net ...
-  <div .modal-body>
-    <p>
-      This could take a minute.
-    <p>
-      You may be prompted for your rsync.net ssh password.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Checking access to rsync.net ...
+      <div .modal-body>
+        <p>
+          This could take a minute.
+        <p>
+          You may be prompted for your rsync.net ssh password.
diff --git a/templates/configurators/rsync.net/encrypt.hamlet b/templates/configurators/rsync.net/encrypt.hamlet
index 215ac2c763..b5cf3c873c 100644
--- a/templates/configurators/rsync.net/encrypt.hamlet
+++ b/templates/configurators/rsync.net/encrypt.hamlet
@@ -35,9 +35,11 @@
     with a new encryption key
 ^{genKeyModal}
 <div .modal .fade #setupmodal>
-  <div .modal-header>
-    <h3>
-      Making repository ...
-  <div .modal-body>
-    <p>
-      Setting up your rsync.net repository. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Making repository ...
+      <div .modal-body>
+        <p>
+          Setting up your rsync.net repository. This could take a minute.
diff --git a/templates/configurators/ssh/enable.hamlet b/templates/configurators/ssh/enable.hamlet
index 4f962312a2..d464c5133a 100644
--- a/templates/configurators/ssh/enable.hamlet
+++ b/templates/configurators/ssh/enable.hamlet
@@ -20,11 +20,13 @@
         ^{form}
         ^{webAppFormAuthToken}
 <div .modal .fade #testmodal>
-  <div .modal-header>
-    <h3>
-      Testing server ...
-  <div .modal-body>
-    <p>
-      Checking ssh connection to the server. This could take a minute.
-    <p>
-      You may be prompted for your password to log into the server.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Testing server ...
+      <div .modal-body>
+        <p>
+          Checking ssh connection to the server. This could take a minute.
+        <p>
+          You may be prompted for your password to log into the server.
diff --git a/templates/configurators/ssh/setupmodal.hamlet b/templates/configurators/ssh/setupmodal.hamlet
index 8c402ffc97..efc7b2d924 100644
--- a/templates/configurators/ssh/setupmodal.hamlet
+++ b/templates/configurators/ssh/setupmodal.hamlet
@@ -1,12 +1,14 @@
 <div .modal .fade #setupmodal>
-  <div .modal-header>
-    <h3>
-      Setting up repository ...
-  <div .modal-body>
-    <p>
-      Setting up repository on the remote server. This could take a minute.
-    $if needsPubKey sshdata
-      <p>
-        You will be prompted once more for your ssh password. A ssh key #
-        is being installed on the server, allowing git-annex to access it #
-        securely without a password.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Setting up repository ...
+      <div .modal-body>
+        <p>
+          Setting up repository on the remote server. This could take a minute.
+        $if needsPubKey sshdata
+          <p>
+            You will be prompted once more for your ssh password. A ssh key #
+            is being installed on the server, allowing git-annex to access it #
+            securely without a password.
diff --git a/templates/configurators/ssh/testmodal.hamlet b/templates/configurators/ssh/testmodal.hamlet
index afb7514d46..33765cea7a 100644
--- a/templates/configurators/ssh/testmodal.hamlet
+++ b/templates/configurators/ssh/testmodal.hamlet
@@ -1,9 +1,11 @@
 <div .modal .fade #testmodal>
-  <div .modal-header>
-    <h3>
-      Testing server ...
-  <div .modal-body>
-    <p>
-      Checking ssh connection to the server. This could take a minute.
-    <p>
-      You may be prompted for your password to log into the server.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Testing server ...
+      <div .modal-body>
+        <p>
+          Checking ssh connection to the server. This could take a minute.
+        <p>
+          You may be prompted for your password to log into the server.
diff --git a/templates/configurators/xmpp.hamlet b/templates/configurators/xmpp.hamlet
index e441c53cc6..48e6aede38 100644
--- a/templates/configurators/xmpp.hamlet
+++ b/templates/configurators/xmpp.hamlet
@@ -29,9 +29,11 @@
           <a .btn .btn-default href="@{DisconnectXMPPR}">
             Stop using this account
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Testing account ...
-  <div .modal-body>
-    <p>
-      Testing jabber account. This could take a minute.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Testing account ...
+      <div .modal-body>
+        <p>
+          Testing jabber account. This could take a minute.
diff --git a/templates/control/notrunning.hamlet b/templates/control/notrunning.hamlet
index 8dabb2ae13..5b92d3f361 100644
--- a/templates/control/notrunning.hamlet
+++ b/templates/control/notrunning.hamlet
@@ -2,9 +2,11 @@
   <p>
     Bye bye!
 <div .modal .fade #shutdownmodal>
-  <div .modal-header>
-    <h3>
-      git-annex has shut down
-  <div .modal-body>
-    <p>
-      You can now close this browser window.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          git-annex has shut down
+      <div .modal-body>
+        <p>
+          You can now close this browser window.
diff --git a/templates/control/repairrepository.hamlet b/templates/control/repairrepository.hamlet
index f7756e9dc1..9164e1eb98 100644
--- a/templates/control/repairrepository.hamlet
+++ b/templates/control/repairrepository.hamlet
@@ -18,9 +18,11 @@
     <a .btn .btn-primary href="@{RepairRepositoryRunR u}" onclick="$('#workingmodal').modal('show');">
       Start Repair Process
 <div .modal .fade #workingmodal>
-  <div .modal-header>
-    <h3>
-      Repairing #{repodesc} ...
-  <div .modal-body>
-    <p>
-      This may take some time.
+  <div .modal-dialog>
+    <div .modal-content>
+      <div .modal-header>
+        <h3>
+          Repairing #{repodesc} ...
+      <div .modal-body>
+        <p>
+          This may take some time.