diff --git a/package-overrides/github/Famous/famous-angular@0.4.0.json b/package-overrides/github/Famous/famous-angular@0.4.0.json
new file mode 100644
index 0000000..85b4bcd
--- /dev/null
+++ b/package-overrides/github/Famous/famous-angular@0.4.0.json
@@ -0,0 +1,16 @@
+{
+    "directories" : {
+        "lib": "dist"
+    },
+    "main": "famous-angular",
+    "dependencies": {
+        "famous": "^0.3.0",
+        "angular": "^1.2.0",
+        "css": "^0.1.0"
+    },
+    "shim": {
+        "famous-angular": {
+            "deps": ["./famous-angular.css!"]
+        }
+    }
+}
diff --git a/package-overrides/github/Famous/famous@0.3.0.json b/package-overrides/github/Famous/famous@0.3.0.json
new file mode 100644
index 0000000..328b8a3
--- /dev/null
+++ b/package-overrides/github/Famous/famous@0.3.0.json
@@ -0,0 +1,14 @@
+{
+    "directories": {
+        "lib": "src"
+    },
+    "dependencies": {
+        "famous-polyfills": "^0.3.0",
+        "css": "^0.1.0"
+    },
+    "shim": {
+        "*/*": {
+            "deps": ["famous-polyfills", "../core/famous.css!"]
+        }
+    }
+}
diff --git a/registry.json b/registry.json
index d956669..49ee31f 100644
--- a/registry.json
+++ b/registry.json
@@ -1,17 +1,17 @@
 {
   "css": "github:systemjs/plugin-css",
+  "font": "github:guybedford/system-font",
   "image": "github:systemjs/plugin-image",
   "json": "github:systemjs/plugin-json",
-  "text": "github:systemjs/plugin-text",
-  "font": "github:guybedford/system-font",
   "md": "github:guybedford/system-md",
+  "text": "github:systemjs/plugin-text",
 
   "ace": "github:ajaxorg/ace-builds",
   "angular": "github:angular/bower-angular",
-  "angular-mocks": "github:angular/bower-angular-mocks",
-  "angular-cookies": "github:angular/bower-angular-cookies",
   "angular-animate": "github:angular/bower-angular-animate",
+  "angular-cookies": "github:angular/bower-angular-cookies",
   "angular-material": "github:angular/bower-material",
+  "angular-mocks": "github:angular/bower-angular-mocks",
   "angular-ui-router": "github:angular-ui/ui-router",
   "angular-ui-router-extras": "github:christopherthielen/ui-router-extras",
   "angular-ui-tree": "github:JimLiu/angular-ui-tree",
@@ -20,8 +20,8 @@
   "backbone.babysitter": "github:marionettejs/backbone.babysitter",
   "backbone.wreqr": "github:marionettejs/backbone.wreqr",
   "bootstrap": "github:twbs/bootstrap",
-  "chosen": "github:harvesthq/chosen",
   "chart": "github:nnnick/Chart.js",
+  "chosen": "github:harvesthq/chosen",
   "cola": "github:cujojs/cola",
   "cram": "github:cujojs/cram",
   "curl": "github:cujojs/curl",
@@ -30,9 +30,9 @@
   "dropzone": "github:enyo/dropzone",
   "ember": "github:components/ember",
   "ember-data": "github:components/ember-data",
-  "test.js": "github:some/test",
   "famous": "github:Famous/famous",
   "famous-angular": "github:Famous/famous-angular",
+  "famous-polyfills": "github:Famous/polyfills",
   "font-awesome": "npm:font-awesome",
   "foundation": "github:zurb/bower-foundation",
   "hammer": "github:hammerjs/hammer.js",
@@ -59,25 +59,27 @@
   "msgs": "github:cujojs/msgs",
   "mustache": "github:janl/mustache.js",
   "ng-multi-transclude": "github:zachsnow/ng-multi-transclude",
-  "nprogress": "github:rstacruz/nprogress",
   "nodelibs": "github:jspm/nodelibs",
+  "nprogress": "github:rstacruz/nprogress",
   "parallax": "github:wagerfield/parallax",
   "pikaday": "github:dbushell/Pikaday",
   "poly": "github:cujojs/poly",
   "prism": "github:LeaVerou/prism",
   "quint": "github:jquery/qunit",
-  "ratchet": "github:maker/ratchet",
   "raphael": "github:DmitryBaranovskiy/raphael",
-  "reqwest": "github:ded/reqwest",
+  "ratchet": "github:maker/ratchet",
   "react": "github:reactjs/react-bower",
   "react-router": "github:rackt/react-router",
+  "reqwest": "github:ded/reqwest",
   "respond": "github:scottjehl/Respond",
   "rest": "github:cujojs/rest",
   "select2": "github:ivaynberg/select2",
   "showdown": "github:showdownjs/showdown",
   "skrollr": "github:Prinzhorn/skrollr",
   "spin": "github:fgnass/spin.js",
+  "test.js": "github:some/test",
   "tinygrowl": "github:ajkochanowicz/tinygrowl",
+  "trusktr-famous": "github:trusktr/famous",
   "typeahead": "github:twitter/typeahead.js",
   "underscore": "npm:underscore",
   "webfont": "github:components/webfontloader",