diff --git a/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js b/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
index 42399fd2b..150607a9a 100644
--- a/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
+++ b/guacamole/src/main/webapp/app/groupList/directives/guacGroupList.js
@@ -35,7 +35,36 @@ angular.module('groupList').directive('guacGroupList', [function guacGroupList()
              *
              * @type ConnectionGroup|Object 
              */
-            connectionGroup : '='
+            connectionGroup : '=',
+
+            /**
+             * Arbitrary object which shall be made available to the connection
+             * and connection group templates within the scope as
+             * <code>context</code>.
+             */
+            context : '=',
+
+            /**
+             * The URL or ID of the Angular template to use when rendering a
+             * connection. The @link{GroupListItem} associated with that
+             * connection will be exposed within the scope of the template
+             * as <code>item</code>, and the arbitrary context object, if any,
+             * will be exposed as <code>context</code>.
+             *
+             * @type String
+             */
+            connectionTemplate : '=',
+
+            /**
+             * The URL or ID of the Angular template to use when rendering a
+             * connection group. The @link{GroupListItem} associated with that
+             * connection group will be exposed within the scope of the
+             * template as <code>item</code>, and the arbitrary context object,
+             * if any, will be exposed as <code>context</code>.
+             *
+             * @type String
+             */
+            connectionGroupTemplate : '='
 
         },
 
diff --git a/guacamole/src/main/webapp/app/groupList/styles/groupList.css b/guacamole/src/main/webapp/app/groupList/styles/groupList.css
deleted file mode 100644
index 85fdf92d6..000000000
--- a/guacamole/src/main/webapp/app/groupList/styles/groupList.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2014 Glyptodon LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
diff --git a/guacamole/src/main/webapp/app/groupList/templates/guacGroupList.html b/guacamole/src/main/webapp/app/groupList/templates/guacGroupList.html
index 269961041..942cacb79 100644
--- a/guacamole/src/main/webapp/app/groupList/templates/guacGroupList.html
+++ b/guacamole/src/main/webapp/app/groupList/templates/guacGroupList.html
@@ -25,35 +25,18 @@
 
         <!-- Connection -->
         <div class="connection" ng-show="item.isConnection">
-            <a ng-href="#/client/c/{{item.identifier}}">
-                <div class="caption">
-
-                    <!-- Connection icon -->
-                    <div class="protocol">
-                        <div class="icon type" ng-class="item.protocol"></div>
-                    </div>
-
-                    <!-- Connection name -->
-                    <span class="name">{{item.name}}</span>
-
-                </div>
-            </a>
+            <ng-include src="connectionTemplate"/>
         </div>
 
         <!-- Connection group -->
         <div class="group" ng-show="item.isConnectionGroup">
-
             <div class="caption">
 
                 <!-- Connection group icon -->
                 <div class="icon group type" ng-click="toggleExpanded(item)"
                      ng-class="{expanded: item.isExpanded, empty: !item.children.length, balancer: item.isBalancing}"></div>
 
-                <!-- Connection group name -->
-                <span class="name">
-                    <a ng-show="item.isBalancing" ng-href="#/client/g/{{item.identifier}}">{{item.name}}</a>
-                    <span ng-show="!item.isBalancing">{{item.name}}</span>
-                </span>
+                <ng-include src="connectionGroupTemplate"/>
 
             </div>
 
diff --git a/guacamole/src/main/webapp/app/home/templates/connection.html b/guacamole/src/main/webapp/app/home/templates/connection.html
new file mode 100644
index 000000000..f9fc9c554
--- /dev/null
+++ b/guacamole/src/main/webapp/app/home/templates/connection.html
@@ -0,0 +1,35 @@
+<a ng-href="#/client/c/{{item.identifier}}">
+    <!--
+       Copyright (C) 2014 Glyptodon LLC
+
+       Permission is hereby granted, free of charge, to any person obtaining a copy
+       of this software and associated documentation files (the "Software"), to deal
+       in the Software without restriction, including without limitation the rights
+       to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+       copies of the Software, and to permit persons to whom the Software is
+       furnished to do so, subject to the following conditions:
+
+       The above copyright notice and this permission notice shall be included in
+       all copies or substantial portions of the Software.
+
+       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+       IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+       FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+       AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+       LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+       THE SOFTWARE.
+    -->
+
+    <div class="caption">
+
+        <!-- Connection icon -->
+        <div class="protocol">
+            <div class="icon type" ng-class="item.protocol"></div>
+        </div>
+
+        <!-- Connection name -->
+        <span class="name">{{item.name}}</span>
+
+    </div>
+</a>
diff --git a/guacamole/src/main/webapp/app/home/templates/connectionGroup.html b/guacamole/src/main/webapp/app/home/templates/connectionGroup.html
new file mode 100644
index 000000000..ef140b1fe
--- /dev/null
+++ b/guacamole/src/main/webapp/app/home/templates/connectionGroup.html
@@ -0,0 +1,26 @@
+<span class="name">
+    <!--
+       Copyright (C) 2014 Glyptodon LLC
+
+       Permission is hereby granted, free of charge, to any person obtaining a copy
+       of this software and associated documentation files (the "Software"), to deal
+       in the Software without restriction, including without limitation the rights
+       to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+       copies of the Software, and to permit persons to whom the Software is
+       furnished to do so, subject to the following conditions:
+
+       The above copyright notice and this permission notice shall be included in
+       all copies or substantial portions of the Software.
+
+       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+       IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+       FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+       AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+       LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+       OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+       THE SOFTWARE.
+    -->
+
+    <a ng-show="item.isBalancing" ng-href="#/client/g/{{item.identifier}}">{{item.name}}</a>
+    <span ng-show="!item.isBalancing">{{item.name}}</span>
+</span>
diff --git a/guacamole/src/main/webapp/app/home/templates/home.html b/guacamole/src/main/webapp/app/home/templates/home.html
index 1b10fbb58..384e1b5f8 100644
--- a/guacamole/src/main/webapp/app/home/templates/home.html
+++ b/guacamole/src/main/webapp/app/home/templates/home.html
@@ -36,7 +36,10 @@
     <!-- All connections for this user -->
     <h2>{{'home.allConnections' | translate}}</h2>
     <div class="all-connections" ng-class="{loading: loading}">
-        <guac-group-list connection-group="rootConnectionGroup"/>
+        <guac-group-list
+            connection-group="rootConnectionGroup"
+            connection-template="'app/home/templates/connection.html'"
+            connection-group-template="'app/home/templates/connectionGroup.html'"/>
     </div>
 
 </div>
\ No newline at end of file