diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index e9cf324fc..6a6b6a44e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,6 +1,7 @@
 7.8.0
  - fixed #10856: no paginate in wiki keyword search 
  - fixed #10877: getProfileUrl() broken
+ - fixed #10878: Template issues in 7.7.19
  - fixed #10844: Ad Sales: No template variable Help
  - fixed #10873: Code editor breaks CSS comments
 
diff --git a/docs/upgrades/packages-7.8.0/000001000001000045000014.json b/docs/upgrades/packages-7.8.0/000001000001000045000014.json
new file mode 100644
index 000000000..932964fcf
--- /dev/null
+++ b/docs/upgrades/packages-7.8.0/000001000001000045000014.json
@@ -0,0 +1,47 @@
+{
+   "storage" : [],
+   "properties" : {
+      "lastExportedAs" : null,
+      "createdBy" : "3",
+      "state" : "published",
+      "newWindow" : "0",
+      "extraHeadTagsPacked" : null,
+      "synopsis" : null,
+      "extraHeadTags" : null,
+      "ownerUserId" : "3",
+      "url" : "root/import/survey/surveyedit.css",
+      "assetId" : "kwTL1SWCk0GlpiJ5zAAEPQ",
+      "isPrototype" : "0",
+      "isHidden" : "1",
+      "groupIdEdit" : "12",
+      "inheritUrlFromParent" : "0",
+      "processAsTemplate" : "0",
+      "className" : "WebGUI::Asset::Snippet",
+      "lineage" : "000001000001000045000014",
+      "stateChangedBy" : "3",
+      "lastModified" : "1251936280",
+      "groupIdView" : "7",
+      "title" : "surveyedit.css",
+      "mimeType" : "text/css",
+      "skipNotification" : "0",
+      "assetSize" : "5215",
+      "status" : "approved",
+      "menuTitle" : "surveyedit.css",
+      "isLockedBy" : null,
+      "stateChanged" : "1251849727",
+      "revisionDate" : "1250243000",
+      "isPackage" : "0",
+      "usePackedHeadTags" : "0",
+      "snippet" : "#editor_container {\r\n    visibility: hidden;\r\n    z-index:  100;\r\n}\r\n\r\n#loading-mask {\r\n  position: absolute;\r\n  left:     0;\r\n  top:      0;\r\n  width:    100%;\r\n  height:   100%;\r\n  z-index:  20000;\r\n  background-color: white;\r\n  opacity:0.6;\r\n  filter:alpha(opacity=60);\r\n}\r\n\r\n#loading {\r\n  position: absolute;\r\n  left:     50%;\r\n  top:      50%;\r\n  padding:  2px;\r\n  z-index:  20001;\r\n  height:   auto;\r\n  margin:   -35px 0 0 -30px;\r\n}\r\n\r\n#loading .loading-indicator {\r\n  background: url(^Extras(\"wobject/Survey/rel_interstitial_loading.gif\");) no-repeat;\r\n  color:      #555;\r\n  font:       bold 13px tahoma,arial,helvetica;\r\n  padding:    18px 80px;\r\n  margin:     0;\r\n  text-align: center;\r\n  height:     auto;\r\n  z-index:  20002;\r\n}\r\n\r\n\r\ndiv.testarea {\r\n    width: 200px;\r\n    height: 100px;\r\n    z-index: 999;\r\n    border: 1px solid gray;\r\n    background: #f7f7f7;\r\n    position: absolute;\r\n    top: 5%;\r\n    left:5%;\r\n}\r\n\r\ndiv.trashcan { \r\n    border: 1px solid gray;\r\n    width: 175px; \r\n    height: 50px; \r\n}\r\n\r\ndiv.editarea { \r\n\tmargin-top:40px;\r\n    padding:10px; \r\n    float:left;\r\n    border: 1px solid gray;\r\n}\r\n\r\ndiv.editquestion { \r\n\tpadding:10px; \r\n\tfloat:left; \r\n}\r\ndiv.editanswer { \r\n\tpadding:10px; \r\n\tfloat:left; \r\n}\r\n\r\n#submitbutton { padding:20px; }\r\n\r\ndiv.entry { \r\n    padding-bottom:10px;\r\n    padding-left:10px;\r\n}\r\n\r\nul.draglist { \r\n    list-style: none;\r\n    margin:0;\r\n    padding:0;\r\n}\r\n\r\nul.draglist li {\r\n    margin: 1px;\r\n}\r\n\r\nul.questionList {\r\n    position: relative;\r\n    background: #f7f7f7;\r\n    border: 1px solid gray;\r\n    list-style: none;\r\n    margin:0;\r\n    padding:0;\r\n    min-height: 40px\r\n}\r\n\r\nli.section {\r\n    background-color: #CCCCFF;\r\n    border:1px solid #7EA6B2;\r\n    cursor: move; \r\n    min-height: 10px;\r\n}\r\nli.question {\r\n    background-color: #D1E6EC;\r\n    border:1px solid #7EA6B2;\r\n    cursor: move; \r\n\tpadding-left:10px; \r\n    min-height: 10px;\r\n}\r\nli.answer {\r\n    background-color: #F1FFB8;\r\n    border:1px solid #7EA6B2;\r\n    cursor: move; \r\n\tpadding-left:15px; \r\n    min-height: 10px;\r\n}\r\n#sections-panel li.selected {\r\n    background-image: url(^Extras(\"toolbar/bullet/moveRight.gif\"););\r\n    background-position:99% center;\r\n    background-repeat: no-repeat;\r\n    font-weight:bold;\r\n}\r\n\r\n#goto-yui-ac {\r\n    width:15em;\r\n    margin-top:0.5em;\r\n}\r\n.wGwarning {\r\n    background-color:#FF6666;\r\n    border:1px solid red;\r\n    margin:5px;\r\n    padding:10px;\r\n}\r\n.warning {\r\n    padding: 5px;\r\n}\r\n#sections-panel .bd {\r\n    overflow: auto;\r\n    background-color:#fff;\r\n    padding:10px;\r\n}\r\n#buttons {\r\n    height: 30px; \r\n}\r\n#sections-panel_c .yui-resize .yui-resize-handle-r {\r\n    right: -6px; /* make room for the scroll-bars */\r\n}\r\n#sections-panel div.ft {\r\n    font-size: 100%;\r\n}\r\n",
+      "snippetPacked" : "#editor_container { visibility: hidden; z-index: 100; }#loading-mask { position: absolute; left: 0; top: 0; width: 100%; height: 100%; z-index: 20000; background-color: white; opacity:0.6; filter:alpha(opacity=60); }#loading { position: absolute; left: 50%; top: 50%; padding: 2px; z-index: 20001; height: auto; margin: -35px 0 0 -30px; }#loading .loading-indicator { background: url(^Extras(\"wobject/Survey/rel_interstitial_loading.gif\");) no-repeat; color: #555; font: bold 13px tahoma,arial,helvetica; padding: 18px 80px; margin: 0; text-align: center; height: auto; z-index: 20002; }div.testarea { width: 200px; height: 100px; z-index: 999; border: 1px solid gray; background: #f7f7f7; position: absolute; top: 5%; left:5%; }div.trashcan { border: 1px solid gray; width: 175px; height: 50px; }div.editarea { margin-top:40px; padding:10px; float:left; border: 1px solid gray; }div.editquestion { padding:10px; float:left; }div.editanswer { padding:10px; float:left; }#submitbutton { padding:20px; } div.entry { padding-bottom:10px; padding-left:10px; }ul.draglist { list-style: none; margin:0; padding:0; }ul.draglist li { margin: 1px; }ul.questionList { position: relative; background: #f7f7f7; border: 1px solid gray; list-style: none; margin:0; padding:0; min-height: 40px }li.section { background-color: #CCCCFF; border:1px solid #7EA6B2; cursor: move; min-height: 10px; }li.question { background-color: #D1E6EC; border:1px solid #7EA6B2; cursor: move; padding-left:10px; min-height: 10px; }li.answer { background-color: #F1FFB8; border:1px solid #7EA6B2; cursor: move; padding-left:15px; min-height: 10px; }#sections-panel li.selected { background-image: url(^Extras(\"toolbar/bullet/moveRight.gif\");); background-position:99% center; background-repeat: no-repeat; font-weight:bold; }#goto-yui-ac { width:15em; margin-top:0.5em; }.wGwarning { background-color:#FF6666; border:1px solid red; margin:5px; padding:10px; }.warning { padding: 5px; }#sections-panel .bd { overflow: auto; background-color:#fff; padding:10px; }#buttons { height: 30px; }#sections-panel_c .yui-resize .yui-resize-handle-r { right: -6px; /* make room for the scroll-bars */ }#sections-panel div.ft { font-size: 100%; }",
+      "encryptPage" : "0",
+      "cacheTimeout" : "3600",
+      "tagId" : "JVJD4aPqct9tkc5qafKC6A",
+      "isSystem" : "0",
+      "isExportable" : "1",
+      "revisedBy" : "3",
+      "creationDate" : "1244488512",
+      "parentId" : "5bnNzteN7w3NnK9mF4XiCg",
+      "usePacked" : "0"
+   }
+}
\ No newline at end of file
diff --git a/docs/upgrades/packages-7.8.0/default_webgui_anonymous_registration_template.wgpkg b/docs/upgrades/packages-7.8.0/default_webgui_anonymous_registration_template.wgpkg
new file mode 100644
index 000000000..a5af339db
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/default_webgui_anonymous_registration_template.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/home_thinyrecord-templates_default-thingyrecord-view.wgpkg b/docs/upgrades/packages-7.8.0/home_thinyrecord-templates_default-thingyrecord-view.wgpkg
new file mode 100644
index 000000000..26455758e
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/home_thinyrecord-templates_default-thingyrecord-view.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/import_hierarchical-top-nav.wgpkg b/docs/upgrades/packages-7.8.0/import_hierarchical-top-nav.wgpkg
new file mode 100644
index 000000000..9c7e84196
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/import_hierarchical-top-nav.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/matrix-default-detailed-listing.wgpkg b/docs/upgrades/packages-7.8.0/matrix-default-detailed-listing.wgpkg
new file mode 100644
index 000000000..279b93ee0
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/matrix-default-detailed-listing.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/matrix-default-view-template.wgpkg b/docs/upgrades/packages-7.8.0/matrix-default-view-template.wgpkg
new file mode 100644
index 000000000..8ef7a9801
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/matrix-default-view-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/new-matrix_matrix.css.wgpkg b/docs/upgrades/packages-7.8.0/new-matrix_matrix.css.wgpkg
new file mode 100644
index 000000000..b1759c495
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/new-matrix_matrix.css.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_account_contributions_default-contributions-view.wgpkg b/docs/upgrades/packages-7.8.0/root_import_account_contributions_default-contributions-view.wgpkg
new file mode 100644
index 000000000..5b78f4f3e
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_account_contributions_default-contributions-view.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_account_friendmanager_edit.wgpkg b/docs/upgrades/packages-7.8.0/root_import_account_friendmanager_edit.wgpkg
new file mode 100644
index 000000000..1d07058e4
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_account_friendmanager_edit.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_account_inbox_default-inbox-view-template.wgpkg b/docs/upgrades/packages-7.8.0/root_import_account_inbox_default-inbox-view-template.wgpkg
new file mode 100644
index 000000000..f6df33ee4
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_account_inbox_default-inbox-view-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_account_shop_shop-account-layout.wgpkg b/docs/upgrades/packages-7.8.0/root_import_account_shop_shop-account-layout.wgpkg
new file mode 100644
index 000000000..2ca5c3a47
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_account_shop_shop-account-layout.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-account-activation-template.wgpkg b/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-account-activation-template.wgpkg
new file mode 100644
index 000000000..9d847b9a6
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-account-activation-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-welcome-message-template.wgpkg b/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-welcome-message-template.wgpkg
new file mode 100644
index 000000000..e4dadd458
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_auth_webgui_create_default-webgui-welcome-message-template.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_ems_ems-schedule-listing-default2.wgpkg b/docs/upgrades/packages-7.8.0/root_import_ems_ems-schedule-listing-default2.wgpkg
new file mode 100644
index 000000000..c1c0d3389
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_ems_ems-schedule-listing-default2.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_storymanager.wgpkg b/docs/upgrades/packages-7.8.0/root_import_storymanager.wgpkg
new file mode 100644
index 000000000..4d8b63a3e
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_storymanager.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_survey.wgpkg b/docs/upgrades/packages-7.8.0/root_import_survey.wgpkg
new file mode 100644
index 000000000..dba5099e3
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_survey.wgpkg differ
diff --git a/docs/upgrades/packages-7.8.0/root_import_survey_surveyedit.css.wgpkg b/docs/upgrades/packages-7.8.0/root_import_survey_surveyedit.css.wgpkg
new file mode 100644
index 000000000..b0a01175e
Binary files /dev/null and b/docs/upgrades/packages-7.8.0/root_import_survey_surveyedit.css.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.7.19-7.8.0.pl b/docs/upgrades/upgrade_7.7.19-7.8.0.pl
index abbfca06d..37d6204b4 100644
--- a/docs/upgrades/upgrade_7.7.19-7.8.0.pl
+++ b/docs/upgrades/upgrade_7.7.19-7.8.0.pl
@@ -32,6 +32,7 @@ my $session = start(); # this line required
 
 # upgrade functions go here
 reorganizeAdSpaceProperties($session);
+fixTemplateSettingsFromShunt($session);
 
 finish($session); # this line required
 
@@ -57,6 +58,23 @@ sub reorganizeAdSpaceProperties {
     print "DONE!\n" unless $quiet;
 }
 
+sub fixTemplateSettingsFromShunt {
+    my $session = shift;
+    print "\tClear isPackage and set isDefault on recently imported templates... " unless $quiet;
+    ASSET: foreach my $assetId (qw/PBtmpl0000000000000137 CarouselTmpl0000000002 aIpCmr9Hi__vgdZnDTz1jw
+                                   2CS-BErrjMmESOtGT90qOg 2rC4ErZ3c77OJzJm7O5s3w pbtmpl0000000000000220
+                                   pbtmpl0000000000000221 2gtFt7c0qAFNU3BG_uvNvg PBtmpl0000000000000081
+                                   ThingyTmpl000000000001 PcRRPhh-0KfvLLNIPdxJTw g8W53Pd71uHB9pxaXhWf_A/) {
+        my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId);
+        next ASSET unless $asset;
+        $asset->update({
+            isPackage => 0,
+            isDefault => 1,
+        });
+    }
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------