diff --git a/Starfinder by Roll20/Assets/Roll Template border transparent 3.png b/Starfinder by Roll20/Assets/Roll Template border transparent 3.png
new file mode 100644
index 0000000000..a3e026fe92
Binary files /dev/null and b/Starfinder by Roll20/Assets/Roll Template border transparent 3.png differ
diff --git a/Starfinder by Roll20/Assets/SF_header.png b/Starfinder by Roll20/Assets/SF_header.png
new file mode 100644
index 0000000000..66b9f77661
Binary files /dev/null and b/Starfinder by Roll20/Assets/SF_header.png differ
diff --git a/Starfinder by Roll20/Assets/SF_header_flipped.png b/Starfinder by Roll20/Assets/SF_header_flipped.png
new file mode 100644
index 0000000000..b46974c2a9
Binary files /dev/null and b/Starfinder by Roll20/Assets/SF_header_flipped.png differ
diff --git a/Starfinder by Roll20/Assets/SF_header_unselected.png b/Starfinder by Roll20/Assets/SF_header_unselected.png
new file mode 100644
index 0000000000..ecaeb3edd4
Binary files /dev/null and b/Starfinder by Roll20/Assets/SF_header_unselected.png differ
diff --git a/Starfinder by Roll20/Assets/sf-header Crew.png b/Starfinder by Roll20/Assets/sf-header Crew.png
new file mode 100644
index 0000000000..53bdb30cf1
Binary files /dev/null and b/Starfinder by Roll20/Assets/sf-header Crew.png differ
diff --git a/Starfinder by Roll20/Assets/sf-header defense.png b/Starfinder by Roll20/Assets/sf-header defense.png
new file mode 100644
index 0000000000..8dc8aa2443
Binary files /dev/null and b/Starfinder by Roll20/Assets/sf-header defense.png differ
diff --git a/Starfinder by Roll20/Assets/sf-header power.png b/Starfinder by Roll20/Assets/sf-header power.png
new file mode 100644
index 0000000000..94b75ba9c5
Binary files /dev/null and b/Starfinder by Roll20/Assets/sf-header power.png differ
diff --git a/Starfinder by Roll20/Assets/sf-side-header.png b/Starfinder by Roll20/Assets/sf-side-header.png
new file mode 100644
index 0000000000..a1bf87971a
Binary files /dev/null and b/Starfinder by Roll20/Assets/sf-side-header.png differ
diff --git a/Starfinder by Roll20/Assets/ship.png b/Starfinder by Roll20/Assets/ship.png
new file mode 100644
index 0000000000..4a984a5069
Binary files /dev/null and b/Starfinder by Roll20/Assets/ship.png differ
diff --git a/Starfinder by Roll20/Assets/starfinder_1000x200.png b/Starfinder by Roll20/Assets/starfinder_1000x200.png
new file mode 100644
index 0000000000..e9a124b05c
Binary files /dev/null and b/Starfinder by Roll20/Assets/starfinder_1000x200.png differ
diff --git a/Starfinder Official/Starfinder.css b/Starfinder by Roll20/Starfinder.css
similarity index 99%
rename from Starfinder Official/Starfinder.css
rename to Starfinder by Roll20/Starfinder.css
index 899a24f22b..927f33d512 100644
--- a/Starfinder Official/Starfinder.css	
+++ b/Starfinder by Roll20/Starfinder.css	
@@ -231,7 +231,7 @@ label:hover,
 }
 .sheet-starfinder .sheet-section{
   border: 10px solid transparent;
-  border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/SF_header.png') 17 27 fill repeat;
+  border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/SF_header.png') 17 27 fill repeat;
   text-transform: uppercase;
   font-weight: normal;
   font-size: 10pt;
@@ -360,14 +360,14 @@ label:hover,
     z-index:11;
 }
 .sheet-hide-tab:not(:checked):not(:hover) + .sheet-section{
-  border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/SF_header_unselected.png') 17 27 fill repeat;
+  border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/SF_header_unselected.png') 17 27 fill repeat;
     z-index:-1;
 }
 .sheet-page.sheet-core .sheet-combat .sheet-section-check:not(:checked) + .sheet-head{
     z-index:-1;
 }
 .sheet-page.sheet-core .sheet-combat .sheet-section-check:not(:checked):not(:hover) + .sheet-head{
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/SF_header_unselected.png') 17 27 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/SF_header_unselected.png') 17 27 fill repeat;
     z-index:-4;
 }
 .sheet-pc > .sheet-header-content > .sheet-char-details:checked ~ .sheet-char-details.sheet-border,
@@ -2925,7 +2925,7 @@ input.sheet-cr{
     grid-area:import;
 }
 .sheet-ship .sheet-starship-defense .sheet-section{
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/sf-header%20defense.png') 17 27 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/sf-header%20defense.png') 17 27 fill repeat;
 }
 .sheet-ship .sheet-starship-defense > .sheet-section,
 .sheet-ship .sheet-starship-defense > .sheet-section-container,
@@ -3153,7 +3153,7 @@ input.sheet-cr{
     border-radius:5px 0px;
 }
 .sheet-ship .sheet-crew .sheet-section{
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/sf-header%20Crew.png') 17 27 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/sf-header%20Crew.png') 17 27 fill repeat;
     z-index:2;
 }
 .sheet-ship .sheet-crew .sheet-top-gutter{
@@ -3185,7 +3185,7 @@ input.sheet-cr{
 }
 .sheet-ship .sheet-ship-menus .sheet-section{
     z-index:2;
-    border-image: url('https://github.com/Roll20/roll20-character-sheets/blob/master/Starfinder%20Official/Assets/sf-header%20power.png') 17 27 fill repeat;
+    border-image: url('https://github.com/Roll20/roll20-character-sheets/blob/master/Starfinder%20by%20Roll/Assets/sf-header%20power.png') 17 27 fill repeat;
 }
 .sheet-ship .sheet-ship-menus > .sheet-section-container{
     display:grid;
@@ -3779,7 +3779,7 @@ grid-template-columns:0px [life-support-start sensors-start weapons-start weapon
     display: inline-flex;
     flex-wrap: wrap;
     border: 10px solid transparent;
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/SF_header_unselected.png') 17 27 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/SF_header_unselected.png') 17 27 fill repeat;
     text-transform: uppercase;
     font-weight: normal;
     font-size: 10pt;
@@ -4024,7 +4024,7 @@ div.sheet-select{
 .sheet-rolltemplate-sf_ship .sheet-generic-header,
 .sheet-rolltemplate-sf_ship .sheet-generic-footer{
     border: 10px solid transparent;
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/SF_header.png') 17 27 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/SF_header.png') 17 27 fill repeat;
     text-transform: uppercase;
     font-weight: normal;
     font-size: 10pt;
@@ -4063,7 +4063,7 @@ div.sheet-select{
     grid-template-rows:[content-start border-start] 1fr [content-end border-end];
     grid-gap:var(--ringsize);
     border: 10px solid transparent;
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/sf-side-header.png') 27 17 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/sf-side-header.png') 27 17 fill repeat;
     text-transform: uppercase;
     font-weight: normal;
     padding: 0px;
@@ -4169,7 +4169,7 @@ div.sheet-select{
 .sheet-rolltemplate-sf_spell .sheet-generic-body,
 .sheet-rolltemplate-sf_ship .sheet-generic-body{
     border: 14px solid black;
-    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/Roll%20Template%20border%20transparent%203.png') 23 23 fill repeat;
+    border-image: url('https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/Roll%20Template%20border%20transparent%203.png') 23 23 fill repeat;
     background-color:black;
     grid-area:body;
 }
diff --git a/Starfinder Official/Starfinder.html b/Starfinder by Roll20/Starfinder.html
similarity index 99%
rename from Starfinder Official/Starfinder.html
rename to Starfinder by Roll20/Starfinder.html
index 92177d2795..b173b830ff 100644
--- a/Starfinder Official/Starfinder.html	
+++ b/Starfinder by Roll20/Starfinder.html	
@@ -141,7 +141,7 @@
     <input hidden='true' type='number' title='@{bab}' name='attr_bab' value='0'>
     <!-- The above 3 attributes are used for calculations for NPCs-->
     <div class='name-container'>
-        <img class='header-image' src='https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/starfinder_1000x200.png'>
+        <img class='header-image' src='https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/starfinder_1000x200.png'>
     </div>
     <input class="tab-button options nav hide-tab" type="checkbox" title='@{tab_select}' name="attr_tab_select" value="options" checked>
     <span class='pictos nav'>y</span>
@@ -6172,7 +6172,7 @@
                     <div class='hexagon'></div>
                     <div class='hexagon'></div>
                     <div class='hexagon center-hex'>
-                        <img src='https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20Official/Assets/ship.png'>
+                        <img src='https://cdn.rawgit.com/Roll20/roll20-character-sheets/d0602504/Starfinder%20by%20Roll/Assets/ship.png'>
                     </div>
                     <div class='hexagon'></div>
                     <div class='hexagon'></div>
diff --git a/Starfinder Official/StarfinderOfficialPreview.PNG b/Starfinder by Roll20/StarfinderOfficialPreview.PNG
similarity index 100%
rename from Starfinder Official/StarfinderOfficialPreview.PNG
rename to Starfinder by Roll20/StarfinderOfficialPreview.PNG
diff --git a/Starfinder Official/sheet.json b/Starfinder by Roll20/sheet.json
similarity index 100%
rename from Starfinder Official/sheet.json
rename to Starfinder by Roll20/sheet.json
diff --git a/Starfinder Official/translation.json b/Starfinder by Roll20/translation.json
similarity index 100%
rename from Starfinder Official/translation.json
rename to Starfinder by Roll20/translation.json
diff --git a/Starfinder Official/translations/af.json b/Starfinder by Roll20/translations/af.json
similarity index 100%
rename from Starfinder Official/translations/af.json
rename to Starfinder by Roll20/translations/af.json
diff --git a/Starfinder Official/translations/cs.json b/Starfinder by Roll20/translations/cs.json
similarity index 100%
rename from Starfinder Official/translations/cs.json
rename to Starfinder by Roll20/translations/cs.json
diff --git a/Starfinder Official/translations/da.json b/Starfinder by Roll20/translations/da.json
similarity index 100%
rename from Starfinder Official/translations/da.json
rename to Starfinder by Roll20/translations/da.json
diff --git a/Starfinder Official/translations/de.json b/Starfinder by Roll20/translations/de.json
similarity index 100%
rename from Starfinder Official/translations/de.json
rename to Starfinder by Roll20/translations/de.json
diff --git a/Starfinder Official/translations/el.json b/Starfinder by Roll20/translations/el.json
similarity index 100%
rename from Starfinder Official/translations/el.json
rename to Starfinder by Roll20/translations/el.json
diff --git a/Starfinder Official/translations/en.json b/Starfinder by Roll20/translations/en.json
similarity index 100%
rename from Starfinder Official/translations/en.json
rename to Starfinder by Roll20/translations/en.json
diff --git a/Starfinder Official/translations/es.json b/Starfinder by Roll20/translations/es.json
similarity index 100%
rename from Starfinder Official/translations/es.json
rename to Starfinder by Roll20/translations/es.json
diff --git a/Starfinder Official/translations/fr.json b/Starfinder by Roll20/translations/fr.json
similarity index 100%
rename from Starfinder Official/translations/fr.json
rename to Starfinder by Roll20/translations/fr.json
diff --git a/Starfinder Official/translations/he.json b/Starfinder by Roll20/translations/he.json
similarity index 100%
rename from Starfinder Official/translations/he.json
rename to Starfinder by Roll20/translations/he.json
diff --git a/Starfinder Official/translations/it.json b/Starfinder by Roll20/translations/it.json
similarity index 100%
rename from Starfinder Official/translations/it.json
rename to Starfinder by Roll20/translations/it.json
diff --git a/Starfinder Official/translations/ja.json b/Starfinder by Roll20/translations/ja.json
similarity index 100%
rename from Starfinder Official/translations/ja.json
rename to Starfinder by Roll20/translations/ja.json
diff --git a/Starfinder Official/translations/ko.json b/Starfinder by Roll20/translations/ko.json
similarity index 100%
rename from Starfinder Official/translations/ko.json
rename to Starfinder by Roll20/translations/ko.json
diff --git a/Starfinder Official/translations/nl.json b/Starfinder by Roll20/translations/nl.json
similarity index 100%
rename from Starfinder Official/translations/nl.json
rename to Starfinder by Roll20/translations/nl.json
diff --git a/Starfinder Official/translations/pl.json b/Starfinder by Roll20/translations/pl.json
similarity index 100%
rename from Starfinder Official/translations/pl.json
rename to Starfinder by Roll20/translations/pl.json
diff --git a/Starfinder Official/translations/pt.json b/Starfinder by Roll20/translations/pt.json
similarity index 100%
rename from Starfinder Official/translations/pt.json
rename to Starfinder by Roll20/translations/pt.json
diff --git a/Starfinder Official/translations/ru.json b/Starfinder by Roll20/translations/ru.json
similarity index 100%
rename from Starfinder Official/translations/ru.json
rename to Starfinder by Roll20/translations/ru.json
diff --git a/Starfinder Official/translations/sv.json b/Starfinder by Roll20/translations/sv.json
similarity index 100%
rename from Starfinder Official/translations/sv.json
rename to Starfinder by Roll20/translations/sv.json
diff --git a/Starfinder Official/translations/tr.json b/Starfinder by Roll20/translations/tr.json
similarity index 100%
rename from Starfinder Official/translations/tr.json
rename to Starfinder by Roll20/translations/tr.json
diff --git a/Starfinder Official/translations/zh.json b/Starfinder by Roll20/translations/zh.json
similarity index 100%
rename from Starfinder Official/translations/zh.json
rename to Starfinder by Roll20/translations/zh.json
diff --git a/Starfinder Official/translations/zu.json b/Starfinder by Roll20/translations/zu.json
similarity index 100%
rename from Starfinder Official/translations/zu.json
rename to Starfinder by Roll20/translations/zu.json
diff --git a/approved.yaml b/approved.yaml
index f0223ce918..e9f5338f33 100644
--- a/approved.yaml
+++ b/approved.yaml
@@ -45,7 +45,7 @@ pathfinder2e:
 - "Pathfinder Playtest by Roll20"
 
 starfinder:
-- "Starfinder Official"
+- "Starfinder by Roll20"
 - "Starfinder by Roll20"
 
 startrekofficial: