diff --git a/server/documents/index.html.eco b/server/documents/index.html.eco
index 3dcdb3b30..48f2879ab 100755
--- a/server/documents/index.html.eco
+++ b/server/documents/index.html.eco
@@ -15,7 +15,7 @@ type   : 'Semantic'
   <div class="ui page grid">
     <div class="column">
       <div class="introduction">
-        <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.10.1</a></h1>
+        <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/semantic-org/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.10.1</a></h1>
         <h2 class="ui header">UI is the vocabulary of the web.</h2>
         <p>Semantic empowers designers and developers by creating a language for sharing UI.</p>
         <a class="ui black large labeled launch icon button"><i class="icon list layout"></i> View UI</a>
@@ -264,7 +264,7 @@ type   : 'Semantic'
 
 <div class="ui divided horizontal footer link list">
   <div class="item">jack lukic 2013</div>
-  <a href="https://github.com/jlukic/Semantic-UI" class="item">Github</a>
+  <a href="https://github.com/semantic-org/Semantic-UI" class="item">Github</a>
   <div class="item">
     Made possibly by <a href="http://www.quirky.com" target="_blank">Quirky.com</a>
   </div>
diff --git a/server/documents/project/contributing.html.eco b/server/documents/project/contributing.html.eco
index 49dcca719..5e1d3f175 100755
--- a/server/documents/project/contributing.html.eco
+++ b/server/documents/project/contributing.html.eco
@@ -20,15 +20,15 @@ type        : 'Semantic Project'
 
     <p>One of the easiest ways to support Semantic UI is to get the word out</p>
 
-    <script id='fbrob7c'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=jlukic&button=compact&url=https%3A%2F%2Fgithub.com%2Fjlukic%2FSemantic-UI';f.title='Flattr';f.height=31;f.width=110;f.style.marginRight=10;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbrob7c');</script>
+    <script id='fbrob7c'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=semantic-org&button=compact&url=https%3A%2F%2Fgithub.com%2Fsemantic-org%2FSemantic-UI';f.title='Flattr';f.height=31;f.width=110;f.style.marginRight=10;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fbrob7c');</script>
 
-    <iframe src="http://ghbtns.com/github-btn.html?user=jlukic&repo=semantic=ui&type=watch&count=true&size=large"
+    <iframe src="http://ghbtns.com/github-btn.html?user=semantic-org&repo=semantic=ui&type=watch&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="90" height="30"></iframe>
 
-    <iframe src="http://ghbtns.com/github-btn.html?user=jlukic&repo=semantic=ui&type=follow&count=true&size=large"
+    <iframe src="http://ghbtns.com/github-btn.html?user=semantic-org&repo=semantic=ui&type=follow&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="170" height="30"></iframe>
 
-    <iframe src="http://ghbtns.com/github-btn.html?user=jlukic&repo=semantic=ui&type=fork&count=true&size=large"
+    <iframe src="http://ghbtns.com/github-btn.html?user=semantic-org&repo=semantic=ui&type=fork&count=true&size=large"
     allowtransparency="true" frameborder="0" scrolling="0" width="90" height="30"></iframe>
 
     <a href="https://twitter.com/intent/tweet?button_hashtag=semanticui" class="twitter-hashtag-button" data-size="large" data-url="http://www.semantic-ui.com"></a>
@@ -37,20 +37,20 @@ type        : 'Semantic Project'
 
     <h3 class="ui header">Squashing Bugs</h3>
 
-    <p>Please submit any bugs you encounter when using the library to our <a href="https://github.com/jlukic/Semantic-UI/issues?state=open">Github Issues Tracker</a>.</p>
+    <p>Please submit any bugs you encounter when using the library to our <a href="https://github.com/semantic-org/Semantic-UI/issues?state=open">Github Issues Tracker</a>.</p>
 
     <p>Be sure to include a set of steps to reproduce the issue and any related information, browser, OS etc. If we can't see the issue then it will make solving things much more difficult.</p>
 
-    <div class="ui warning message">When submitting a bug report, please <a href="http://jsfiddle.net/jlukic/Vbr9d/1/">Fork this JSFiddle</a> to create a test-case. It will have Semantic and normalize.css included for you automatically.</div>
+    <div class="ui warning message">When submitting a bug report, please <a href="http://jsfiddle.net/semantic-org/Vbr9d/1/">Fork this JSFiddle</a> to create a test-case. It will have Semantic and normalize.css included for you automatically.</div>
 
-    <a class="ui teal button" href="https://github.com/jlukic/Semantic-UI/issues/new"><i class="github icon"></i> Submit a bug report</a>
+    <a class="ui teal button" href="https://github.com/semantic-org/Semantic-UI/issues/new"><i class="github icon"></i> Submit a bug report</a>
 
     <h3 class="ui header">Pull Requests</h3>
 
     <p>If you see a bug and you'd like to fix it, feel free to open a pull request.</p>
     <div class="ui buttons">
-      <a class="ui teal button" href="https://github.com/jlukic/Semantic-UI/compare/">Create a Pull Request</a>
-      <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues?state=open">View Open Issues</a>
+      <a class="ui teal button" href="https://github.com/semantic-org/Semantic-UI/compare/">Create a Pull Request</a>
+      <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues?state=open">View Open Issues</a>
     </div>
 
   </div>
@@ -63,7 +63,7 @@ type        : 'Semantic Project'
 
     <p>If you have suggestions for components missing from Semantic which you'd like to see in future versions please add them to our public UI Component board. The current list of upcoming components, and their current development status can be seen on the contributor UI board.</p>
 
-    <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues/new"><i class="lightbulb icon"></i> Add an idea</a>
+    <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues/new"><i class="lightbulb icon"></i> Add an idea</a>
 
     <h2 class="ui dividing header">Code</h2>
 
@@ -76,7 +76,7 @@ type        : 'Semantic Project'
       <div class="visible content">Help code this</div>
       <div class="hidden content"><i class="mail icon"></i> Reach Out</div>
     </a>
-    <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues/216">Share Ideas</a>
+    <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues/216">Share Ideas</a>
 
     <div class="ui section divider"></div>
 
@@ -88,7 +88,7 @@ type        : 'Semantic Project'
       <div class="visible content">Help code this</div>
       <div class="hidden content"><i class="mail icon"></i> Reach Out</div>
     </a>
-    <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues/206">Share Ideas</a>
+    <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues/206">Share Ideas</a>
 
     <div class="ui section divider"></div>
 
@@ -101,13 +101,13 @@ type        : 'Semantic Project'
       <div class="visible content">Help code this</div>
       <div class="hidden content"><i class="mail icon"></i> Reach Out</div>
     </a>
-    <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues/189">Share Ideas</a>
+    <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues/189">Share Ideas</a>
 
     <div class="ui section divider"></div>
 
     <h3 class="ui header">Test Coverage</h3>
 
-    <p>Semantic uses <a href="">Jasmine</a> with <a href="http://karma-runner.github.io/0.10/index.html" target="_blank">Karma Test Runner</a> and <a href="https://travis-ci.org/jlukic/Semantic-UI" target="_blank">Travis CI</a> to write unit tests for our UI modules.</p>
+    <p>Semantic uses <a href="">Jasmine</a> with <a href="http://karma-runner.github.io/0.10/index.html" target="_blank">Karma Test Runner</a> and <a href="https://travis-ci.org/semantic-org/Semantic-UI" target="_blank">Travis CI</a> to write unit tests for our UI modules.</p>
 
     <p>We need help to increase our code coverage by writing Jasmine tests for <a href="/module.html">modules</a> and to write feature specs which can be used to write tests.</p>
 
@@ -115,7 +115,7 @@ type        : 'Semantic Project'
       <div class="visible content">Help code this</div>
       <div class="hidden content"><i class="mail icon"></i> Reach Out</div>
     </a>
-    <a class="ui button" href="https://github.com/jlukic/Semantic-UI/issues/244">Share Ideas</a>
+    <a class="ui button" href="https://github.com/semantic-org/Semantic-UI/issues/244">Share Ideas</a>
 
   </div>
 
diff --git a/server/documents/project/development.html.eco b/server/documents/project/development.html.eco
index 2a9a249c5..118ca114f 100755
--- a/server/documents/project/development.html.eco
+++ b/server/documents/project/development.html.eco
@@ -2,8 +2,8 @@
 layout      : 'default'
 css         : 'guide'
 
-title       : 'Set-up'
-description : 'A guide to developing locally'
+title       : 'Local Docs'
+description : 'A guide to generating docs locally'
 type        : 'Semantic Project'
 ---
 <script src="/javascript/intro.js"></script>
@@ -12,12 +12,12 @@ type        : 'Semantic Project'
 <div class="main container">
   <div class="peek">
     <div class="ui vertical pointing secondary menu">
-      <a class="active item">Installing Dependencies</a>
-      <a class="item">Fixing Bugs</a>
+      <a class="active item">Install Steps</a>
+      <a class="item">Using Grunt</a>
     </div>
   </div>
 
-  <h2 class="ui dividing header">Installing Dependencies</h2>
+  <h2 class="ui dividing header">Step by Step</h2>
 
   <p>It may be useful to run the development docs locally when working on a forked version of semantic, as the docs themselves help in testing out changes to ui components.</p>
 
@@ -33,7 +33,7 @@ type        : 'Semantic Project'
 
   <h3 class="ui header">2. Fork Semantic</h3>
 
-  <iframe src="http://ghbtns.com/github-btn.html?user=jlukic&repo=semantic=ui&type=fork&count=true&size=large"
+  <iframe src="http://ghbtns.com/github-btn.html?user=semantic-org&repo=semantic=ui&type=fork&count=true&size=large"
   allowtransparency="true" frameborder="0" scrolling="0" width="90" height="30"></iframe>
 
   <h3 class="ui header">3. Install Dependencies</h3>
@@ -52,13 +52,22 @@ type        : 'Semantic Project'
 
   <p>Docpad should now run an instance of semantic-ui.com locally you can access at <code>http://localhost:9778</code></p>
 
-  <h2 class="ui dividing header">Fixing Bugs</h2>
+  <h3 class="ui header">5. (Optional) Install Karma</h3>
 
-  <h3 class="ui header">Watch Script</h3>
+  <p>
+    Unit tests are written in Jasmine, but are run using a test runner called Karma. To install karma you need to grab the npm package.
+  </p>
+  <div class="code" data-title="Installing Test Runner" data-type="terminal">
+    npm install -g karma
+  </div>
+
+  <h2 class="ui dividing header">Using Grunt</h2>
+
+  <h3 class="ui header">Watch Changes in Source</h3>
 
   <p>If you are working on fixing a UI component that is part of Semantic, your best bet is to work actively on the file in <code>/src/{type}/{elementname}/</code> while running a watch script from grunt. This will rebuild the docs after you make changes, so you can see if you have corrected the issue you are fixing.</p>
 
-  <p>To see exactly what this is doing you can check out our <a href="https://github.com/jlukic/Semantic-UI/blob/master/Gruntfile.js">commented gruntfile</a></p>
+  <p>To see exactly what this is doing you can check out our <a href="https://github.com/semantic-org/Semantic-UI/blob/master/Gruntfile.js">commented gruntfile</a></p>
 
   <div class="code" data-title="Watching Changes" data-type="terminal">
     grunt
@@ -66,7 +75,7 @@ type        : 'Semantic Project'
 
   <p>The watch task is the default grunt task for Semantic, so you can start it quite simply.</p>
 
-  <h3 class="ui header">Running Tests</h3>
+  <h3 class="ui header">Run Unit Tests</h3>
   <p>Tests will automatically run with <code>grunt watch</code> if you have started karma</p>
 
   <div class="code" data-title="Execute tests while developing" data-type="terminal">
@@ -78,12 +87,12 @@ type        : 'Semantic Project'
   <div class="code" data-title="Execute tests while developing" data-type="terminal">
     npm test
     // or
-    grunt build
+    grunt test
     // or
     karma run
   </div>
 
-  <h3 class="ui header">Packaging Elements</h3>
+  <h3 class="ui header">Build Semantic Packages Locally</h3>
   <p>For convenience there is also a separate grunt command for building minified, packaged, and compressed versions of the library.</p>
 
   <div class="code" data-title="Building Release Files" data-type="terminal">
diff --git a/server/layouts/default.html.eco b/server/layouts/default.html.eco
index df6bba50b..1314bd751 100755
--- a/server/layouts/default.html.eco
+++ b/server/layouts/default.html.eco
@@ -249,12 +249,10 @@
       <div class="disabled icon item"><i class="right arrow icon"></i></div>
       <% end %>
       <div class="right menu">
-        <% unless 'development' in @getEnvironments(): %>
         <div class="vertically fitted borderless item">
-          <iframe src="http://ghbtns.com/github-btn.html?user=jlukic&repo=semantic-ui&type=watch&count=true"
+          <iframe src="http://ghbtns.com/github-btn.html?user=semantic-org&repo=semantic-ui&type=watch&count=true"
   allowtransparency="true" frameborder="0" scrolling="0" width="95" height="20"></iframe>
         </div>
-        <% end %>
         <% if @document.type is 'UI Element' or @document.type is 'UI View' or @document.type is 'UI Collection' or @document.type is 'UI Module': %>
 <!--         <a class="popup overview icon item" data-content="Toggle Definition">
           <i class="book icon"></i>