diff --git a/helpers/app-derived.js b/helpers/app-derived.js
index e501653..a7c4c9c 100644
--- a/helpers/app-derived.js
+++ b/helpers/app-derived.js
@@ -1,5 +1,20 @@
 // App Data that is derived from other app data
 
+export function getAppType ( app ) {
+
+    if(app.category !== Object(app.category)) {
+        console.warn('app has no categories', app)
+
+        return null
+    }
+
+    if (app.category.slug === 'homebrew') return 'formula'
+
+    if (app.category.slug === 'games') return 'game'
+
+    return 'app'
+}
+
 export function getAppEndpoint ( app ) {
     // console.log('app', app)
 
@@ -7,11 +22,13 @@ export function getAppEndpoint ( app ) {
         console.warn('app has no categories', app)
     }
 
-    if (app.category.slug === 'homebrew') return `/formula/${app.slug}`
+    const appType = getAppType( app )
 
-    if (app.category.slug === 'games') return `/game/${app.slug}`
+    // if (app.category.slug === 'homebrew') return `/formula/${app.slug}`
 
-    return `/app/${app.slug}`
+    // if (app.category.slug === 'games') return `/game/${app.slug}`
+
+    return `/${appType}/${app.slug}`
 }
 
 export function getVideoEndpoint ( video ) {