diff --git a/app/assets/stylesheets/popover.scss b/app/assets/stylesheets/popover.scss
deleted file mode 100644
index 8fe6a1079..000000000
--- a/app/assets/stylesheets/popover.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.popover {
-  .close {
-    opacity: 0;
-    @include transition(opacity, 0.2s);
-    position: relative;
-    top: 1px;
-    right: -5px;
-    float: right;
-    .icons-deletelabel {
-      height: 14px;
-      width: 14px;
-    }
-
-    img { margin-top: 10px; }
-  }
-
-  &:hover {
-    .close {
-      opacity: 0.5;
-
-      &:hover { opacity: 1; }
-    }
-  }
-}
-body {
-  .popover { z-index: 1000; }
-}
-
diff --git a/app/assets/stylesheets/popup.scss b/app/assets/stylesheets/popup.scss
deleted file mode 100644
index c1391081d..000000000
--- a/app/assets/stylesheets/popup.scss
+++ /dev/null
@@ -1,106 +0,0 @@
-//   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3 or later.  See
-//   the COPYRIGHT file.
-
-@import "mixins";
-@import "colors";
-
-body, html{
-  padding: 20px;
-}
-
-body, html, header, footer, ul{
-  padding: 0;
-  margin: 0;
-}
-
-header,
-footer{
-  width: 100%;
-  left: 0;
-}
-
-header{
-  top: 0;
-}
-
-footer{
-  bottom: 0;
-  padding: 5px 0;
-  color: #444;
-}
-
-header{
-  position: relative;
-  font-size: 12px;
-  padding-top: 8px;
-  padding-bottom: 0px;
-  font-weight: 700;
-  color: #fff;
-  vertical-align: top;
-  margin-bottom: 20px;
-
-  #asterisk{
-    position: relative;
-    margin-right: 3px;
-    top: -2px;
-    left: 10px;
-    margin-right: 14px;
-  }
-}
-
-footer{
-  position: absolute;
-  background-color: $background-grey;
-  border-top: 1px solid #ccc;
-  bottom: 0;
-  left: 0;
-}
-
-#popup-contents{
-  width: 700px;
-  text-align:center;
-}
-
-#popup-content-left,
-#popup-content-right{
-  text-align: left;
-  display: inline-block;
-  vertical-align: top;
-  padding: 20px;
-}
-
-#popup-content-left{
-  width: 400px;
-}
-
-#popup-content-right{
-  width: 200px;
-  border-left: 3px solid #555;
-  text-align: center;
-}
-
-ul#requested-scopes{
-  padding-left: 20px;
-  margin-top: 5px;
-
-  li{
-    position: relative;
-    padding: 5px;
-    padding-left: 50px;
-    min-height: 40px;
-    margin-bottom: 15px;
-  }
-
-  .scope-photo{
-    height: 35px;
-    width: 35px;
-    left: 0;
-    position: absolute;
-
-    *{
-      max-height: 100%;
-      max-width: 100%;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/publisher_blueprint.scss b/app/assets/stylesheets/publisher_blueprint.scss
deleted file mode 100644
index 10e3d7ccc..000000000
--- a/app/assets/stylesheets/publisher_blueprint.scss
+++ /dev/null
@@ -1,410 +0,0 @@
-#publisher {
-  z-index: 1;
-  color: $text-grey;
-  position: relative;
-  margin-top: 0;
-  margin-bottom: 0;
-  padding: 0 12px 22px 12px;
-  top: 0;
-  border-bottom: 1px #eee solid;
-
-  form {
-    textarea {
-      resize: none;
-      height: 50px;
-      margin: 0;
-    }
-  }
-
-  &.mention_popup {
-    padding: 1px 12px;
-    margin-bottom: 0;
-    border-bottom: none;
-  }
-
-  &.closed {
-    .options_and_submit {
-      display: none !important;
-    }
-
-    .counter {
-      display: none;
-    }
-  }
-
-  &:not(.closed) {
-    textarea {
-      margin-bottom: 30px;
-    }
-
-    #publisher_textarea_wrapper.with_attachments {
-      textarea {
-        margin-bottom: 20px;
-      }
-    }
-  }
-
-  .mentions-autocomplete-list ul {
-    width: 483px;
-  }
-
-  #publisher_spinner {
-    clear: both;
-    margin-bottom: -2px;
-    min-height: 21px;
-    padding-top: 6px;
-    position: relative;
-    text-align: center;
-  }
-
-  .options_and_submit {
-    min-height: 21px;
-    clear: both;
-    position: relative;
-    padding-top: 6px;
-    margin-bottom: -2px;
-
-    input {
-      display: inline;
-    }
-
-    .public_toggle {
-      text-align: right;
-
-      .dropdown {
-        text-align: left;
-      }
-
-      .icons-monotone_wrench_settings {
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-      }
-
-      a.question_mark {
-        text-decoration: none;
-      }
-    }
-
-    #publisher_service_icons {
-      position: relative;
-      top: 3px;
-      margin-right: 10px;
-
-      .social_media_logos-facebook-16x16,
-      .social_media_logos-twitter-16x16,
-      .social_media_logos-tumblr-16x16,
-      .social_media_logos-wordpress-16x16,
-      .social_media_logos-email-16x16,
-      .social_media_logos-feed-16x16,
-      .social_media_logos-website-16x16 {
-        display: inline-block;
-        height: 16px;
-        width: 16px;
-      }
-    }
-
-    #fileInfo {
-      display: inline;
-      position: relative;
-      top: -2px;
-    }
-  }
-
-  #status_message_fake_text {
-    min-height: 20px;
-    padding: 4px 6px;
-  }
-
-  .content_creation {
-    margin-top: 1em;
-  }
-
-  #file-upload {
-    bottom: 1px !important;
-    display: inline-block;
-    margin: 0;
-    padding: .3em .3em 3px;
-    position: absolute !important;
-    right: 6px;
-    cursor: pointer;
-
-    input[type='file'] {
-      cursor: pointer;
-      right: initial !important;
-      height: 100%;
-      width: 100%;
-      &::-webkit-file-upload-button {
-        cursor: pointer;
-      }
-    }
-
-    img {
-      opacity: 0.4;
-      vertical-align: bottom;
-    }
-
-    &:hover {
-      color: $text-dark-grey;
-      cursor: pointer;
-
-      img {
-        opacity: 0.8;
-      }
-    }
-
-    &:active {
-      color: #444;
-      text-shadow: 0 1px 0 #fafafa;
-
-      img {
-        opacity: 1;
-      }
-    }
-
-    &.loading {
-      opacity: 0.5;
-    }
-  }
-}
-
-#publisher_textarea_wrapper {
-  #hide_publisher {
-    opacity: 0.3;
-    z-index: 5;
-    padding: 3px;
-    position: absolute;
-    right: 6px;
-    margin-top: 9px;
-
-    .icons-deletelabel {
-      height: 14px;
-      width: 14px;
-    }
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-
-  .markdownIndications {
-    position: absolute;
-    bottom: 0px;
-    left: 5px;
-  }
-
-  border-radius: 2px;
-
-  border: 1px solid #ccc;
-  background: #fff;
-
-  &.active {
-    border: 1px solid $border-dark-grey;
-  }
-
-  position: relative;
-  padding-right: 10px;
-
-  textarea {
-    z-index: 2;
-    border: none;
-
-    &:focus {
-      outline: 0;
-      background: transparent;
-    }
-  }
-
-  &.with_attachments {
-    padding-bottom: 25px;
-  }
-
-  #photodropzone {
-    margin: 0 5px;
-    padding: 0;
-
-    li {
-      display: inline-block;
-      margin-right: 4px;
-      img {
-        width: 50px;
-        max-height: 55px;
-      }
-      .circle {
-        border-radius: 20px;
-
-        display: none;
-        z-index: 1;
-        position: absolute;
-        right: -7px;
-        top: -5px;
-        background-color: #333;
-
-        width: 20px;
-        max-width: 20px;
-        height: 20px;
-        max-height: 20px;
-        border: 1px solid #fff;
-      }
-
-      .x {
-        display: none;
-        z-index: 2;
-        position: absolute;
-        top: -3px;
-        right: -1px;
-        font-size: small;
-        font-weight: bold;
-        &:before {
-          content: 'X';
-        }
-      }
-
-      &:hover {
-        cursor: default;
-        .circle {
-          display: block;
-        }
-        .x {
-          display: block;
-        }
-      }
-    }
-  }
-
-  .counter {
-    position: absolute;
-    font-size: 13px;
-    padding: 12px 0 0 5px;
-  }
-  .warning {
-    color: orange;
-  }
-  .exceeded {
-    color: red;
-  }
-}
-
-#publisher.closed {
-  #publisher_textarea_wrapper #hide_publisher,
-  .markdownIndications {
-    display: none;
-  }
-}
-
-#publisher_photo_upload {
-  position: absolute;
-  display: inline;
-  left: 600px;
-  top: 0;
-  z-index: 10;
-}
-
-#publisher-images {
-  #locator {
-    bottom: 1px !important;
-    display: inline-block;
-    margin: 0;
-    position: absolute !important;
-    right: 30px;
-    cursor: pointer;
-    img {
-      padding-top: 2px;
-      opacity: 0.4;
-    }
-    &:hover {
-      color: $text-dark-grey;
-      cursor: pointer;
-      img {
-        opacity: 0.8;
-      }
-    }
-  }
-  #poll_creator {
-    bottom: 1px !important;
-    display: inline-block;
-    margin: 0;
-    cursor: pointer;
-    position: absolute !important;
-    right: 55px;
-    i {
-      opacity: 0.4;
-    }
-    &:hover {
-      color: $text-dark-grey;
-      cursor: pointer;
-      i {
-        opacity: 1;
-      }
-    }
-  }
-
-  .btn {
-    height: 19px;
-    width: 19px;
-  }
-}
-
-#poll_creator_container {
-  border: 1px solid $border-dark-grey;
-  padding: 5px;
-  margin-top: 5px;
-  border-radius: 2px;
-  display: none;
-
-  &.active {
-    display: block;
-  }
-  input {
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    margin-bottom: 0px;
-  }
-  .poll-question input {
-    width: 100%;
-  }
-  .controls {
-    float: none;
-    z-index: none;
-  }
-  .control-group {
-    &.error {
-        color: $red;
-        background: transparent;
-        border: none;
-        padding: 0px;
-
-        input {
-          border-color: $red;
-        }
-      }
-  }
-  .poll-answer {
-    .span1, .span11 { display: inline-block; }
-    .span11 { width: 96%; }
-    input {
-      width: 100%;
-      display: inline-block;
-      vertical-align: bottom;
-    }
-    .remove-answer {
-      opacity: 0.4;
-      cursor: pointer;
-      display: none;
-      line-height: 27px;
-
-      &:hover {
-        opacity: 1;
-      }
-      &.active {
-        display: inline-block;
-      }
-    }
-  }
-  .control-group {
-    margin-bottom: 5px;
-  }
-  .add-answer {
-    padding-top: 5px;
-  }
-}
diff --git a/app/assets/stylesheets/stream_element_blueprint.scss b/app/assets/stylesheets/stream_element_blueprint.scss
deleted file mode 100644
index db787361c..000000000
--- a/app/assets/stylesheets/stream_element_blueprint.scss
+++ /dev/null
@@ -1,288 +0,0 @@
-.stream {
-  audio {
-    display: block;
-    margin: 5px 0;
-  }
-
-  .stream_element {
-    border-bottom: 1px solid $border-grey;
-
-    h1, h2, h3, h4, h5, h6 {
-      word-wrap: break-word;
-      word-break: break-word;
-    }
-
-    p {
-      &:last-child {
-        padding-bottom: 0;
-        margin-bottom: 0;
-      }
-    }
-
-    &:first-child {
-      border-top: none;
-    }
-
-    ul {
-      li {
-        list-style: disc;
-      }
-    }
-
-    .youtube-player, .vimeo-player {
-      border: none;
-      height: 304px;
-      width: 410px;
-    }
-  }
-}
-
-.stream_element {
-  &.highlighted { border-left: 3px solid $blue; }
-
-  a.author {
-    font-weight: bold;
-    unicode-bidi: bidi-override;
-  }
-
-  .photo_attachments {
-    margin-top: 7px;
-  }
-
-  img {
-    max-width: 100%;
-  }
-
-  .bd {
-    > img {
-      height: 30px;
-      width: 30px;
-      float: left;
-      margin-right: 10px;
-    }
-  }
-
-  .info {
-    font-size: 11px;
-  }
-
-  .stream_photo {
-    float: left;
-    margin-top: 6px;
-  }
-
-  .controls:first-child {
-    .control_icon {
-      @include transition(opacity);
-      opacity: 0;
-    }
-  }
-
-  &:hover {
-    .controls:first-child {
-      .control_icon {
-        opacity: 0.3;
-      }
-      .control_icon:hover {
-        opacity: 1;
-      }
-    }
-  }
-}
-
-.status_message_show {
-  .comment_box {
-    width: 653px;
-    margin-bottom: 5px;
-  }
-}
-
-.post_scope {
-  cursor: default;
-}
-
-.stream_element .reshare,
-.comment {
-  .avatar {
-    width: 30px;
-    height: 30px;
-  }
-}
-
-.likes,
-.stream_element div.reshare {
-  font-size: 12px;
-}
-
-.comment, .stream_element {
-  >.highlighted {
-    border-left: 3px solid $blue;
-    padding-left: 3px;
-  }
-}
-
-.comment.no-border {
-  &.media {
-    border: none;
-    padding: 0;
-  }
-}
-
-.comment {
-  &.media {
-    margin-left: 0;
-    margin-right: 0;
-
-    border-top: 1px dotted #aaa;
-
-    padding-top: 10px;
-
-    .controls {
-      .comment_delete, .comment_report {
-        @include transition(opacity);
-        opacity: 0;
-      }
-    }
-    &:hover {
-      .controls {
-        .comment_delete, .comment_report {
-          opacity: 0.3;
-        }
-        .comment_delete:hover, .comment_report:hover {
-          opacity: 1;
-        }
-      }
-    }
-  }
-
-  .youtube-player, .vimeo-player {
-    border: none;
-    height: 250px;
-    width: 400px;
-  }
-
-  .ltr {
-    ol, ul {
-      padding-left: 2em;
-      li {
-        padding: 0px;
-        border: none;
-        list-style: inherit;
-      }
-    }
-  }
-
-  .right {
-    right: 4px;
-  }
-}
-
-.stream_element {
-  .new_comment_form_wrapper {
-    width: 415px;
-  }
-}
-
-.stream_element .bd {
-  & > .likes, & > .comments {
-    margin-right: 15px;
-  }
-}
-
-.status-message-location {
-  .near-from {
-    font-size: smaller;
-    color: #aaa;
-    width: 100%;
-    float: left;
-  }
-  .address {
-    font-size: 11px;
-    color: #bbb;
-  }
-}
-
-.stream_element .post-content div.reshare {
-  border-left: 2px solid $border-grey;
-}
-
-.stream_element.loaded .media .bd .feedback {
-  clear: both;
-}
-
-form.new_comment {
-  input {
-    display: none;
-  }
-
-  textarea {
-    height: 21px;
-    font-size: 12px;
-    width: 364px;
-  }
-
-  &.open {
-    input {
-      display: block;
-    }
-  }
-}
-
-.stream_element {
-  .subject {
-    font-size: 13px;
-    font-weight: bold;
-    color: #444;
-    overflow: hidden;
-    white-space: nowrap;
-  }
-
-  .last_author {
-    font-size: 12px;
-    color: $text-dark-grey;
-  }
-
-  .collapsible {
-    overflow: hidden;
-    position: relative;
-
-    p {
-      margin: 0 0 0.8em;
-    }
-    p:last-of-type {
-      margin: 0;
-    }
-
-    .expander {
-      position: absolute;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      height: 30px;
-      text-align: center;
-      line-height: 48px;
-      font-size: .8em;
-      color: $grey;
-      text-shadow: 0 0 7px #FFF;
-      cursor: pointer;
-      border-bottom: 2px solid $border-grey;
-      border-radius: 0 0 3px 3px;
-      @include linear-gradient(rgba(255,255,255,0) , #EEE, 0%, 95%);
-      background-color: transparent;
-    }
-
-    .oembed {
-      background: image-url('ajax-loader2.gif') no-repeat center center;
-      float: left;
-      width: 100%;
-
-      .thumb {
-        @include video-overlay();
-      }
-
-      iframe, .thumb img {
-        width: 100%;
-      }
-    }
-  }
-}
diff --git a/app/assets/stylesheets/ui.scss b/app/assets/stylesheets/ui.scss
deleted file mode 100644
index 8ee3c2e7f..000000000
--- a/app/assets/stylesheets/ui.scss
+++ /dev/null
@@ -1,251 +0,0 @@
-//   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3 or later.  See
-//   the COPYRIGHT file.
-
-@import "_mixins";
-
-$button-border-color: #aaa;
-
-.ui-autocomplete {
-  left: -11px
-}
-
-.button {
-  @include button-gradient($light-grey);
-  box-shadow: 0 1px 1px #cfcfcf;
-  @include transition(border);
-
-  display: inline;
-
-  font: {
-    style: normal;
-    size: 12px;
-  }
-  color: #505050;
-
-  padding: 4px 9px;
-
-  min-width: 90px;
-  min-height: 10px;
-
-  border: 1px solid $button-border-color;
-  border-radius: 3px;
-
-  cursor: pointer;
-  white-space: nowrap;
-
-  &:hover {
-    @include button-gradient-hover-no-saturation($light-grey);
-    color: #505050;
-    text-decoration: none;
-    border: 1px solid darken($button-border-color,15%);
-  }
-
-  &:active {
-    @include linear-gradient(#acacac,#808080);
-  }
-
-  img {
-    position: relative;
-    height: 20px;
-    width: 20px;
-    top: 6px;
-  }
-}
-
-/* fix for input height */
-input.button {
-  padding: 3px 9px {
-    bottom: 4px
-  }
-}
-
-.button .selected {
-  @include linear-gradient(#f0f0f0,$highlight-white,29%,85%);
-
-  border-top: 1px solid #aaa;
-}
-
-.button {
-  &.delete {
-    color: desaturate($red,10%);
-  }
-
-  &.in_aspects {
-    @include button-gradient($green);
-    &:hover {
-      @include button-gradient-hover($green);
-    }
-  }
-
-  &.creation {
-    @include button-gradient($creation-blue);
-    color: #fff;
-
-    border: 1px solid darken($button-border-color,20%);
-
-    &:hover {
-      @include button-gradient-hover($creation-blue);
-      border: 1px solid darken($button-border-color,35%);
-    }
-  }
-
-  &.red_on_hover {
-    &:hover {
-      @include button-gradient(#F74427);
-      color: #222;
-    }
-  }
-}
-
-.right {
-  position: absolute;
-  right: 0;
-}
-
-.dropdown {
-  position: relative;
-  display: inline-block;
-
-  .button {
-    width: 240px;
-  }
-
-  .wrapper {
-    box-shadow: 0 2px 5px #666;
-    @include transition(opacity);
-
-    display: none;
-    z-index: 20;
-    position: absolute;
-    width: 140px;
-    margin-top: 2px;
-    background-color: #fff;
-    border: 1px solid $border-dark-grey;
-
-    ul {
-      @include user-select(none);
-      font-size: normal;
-
-      padding: 0 !important;
-      margin: 0 !important;
-      color: #000;
-
-      > li {
-        font-size: 11px !important;
-        padding: 6px 2px {
-          left: 24px; }
-        position: relative;
-        color: #222;
-        list-style: none !important;
-
-        &.selected {
-          background: {
-            image: image-url('icons/check_yes_ok.png');
-            position: 3px 6px;
-            repeat: no-repeat;
-          }
-        }
-
-        &.selected:hover {
-          background: {
-            image: image-url('icons/check_yes_ok_white.png');
-            position: 3px 4px;
-          }
-        }
-
-        &.loading {
-          background: {
-            image: image-url('ajax-loader.gif');
-            repeat: no-repeat;
-            position: 4px 2px;
-          }
-        }
-
-        &.loading:hover {
-          background: {
-            image: image-url('ajax-loader_inverted.gif');
-            /* bump top position up 1px to compensate for the 1px added top border */
-            position: 4px 1px;
-          }
-        }
-
-        &.newItem {
-          a {
-            color: $text-grey;
-            font-style: italic;
-
-            &:hover {
-              text-decoration: none;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  &.hang_right {
-    .wrapper {
-      border-radius: 3px 0 3px 3px;
-      right: 3px;
-    }
-  }
-
-  &.hang_left {
-    .wrapper {
-      border-radius: 0 3px 3px 3px;
-      left: 0px;
-    }
-  }
-
-  .selected {
-    font-weight: bold;
-  }
-
-  &.active {
-    .wrapper {
-      display: block;
-    }
-
-    .button {
-      border-radius: 3px 3px 0 0;
-      border: 1px solid #444;
-    }
-
-    .button {
-      background: #666;
-    }
-
-    .button,
-    .wrapper ul > li:hover {
-      background-color: #666;
-      color: #fff;
-      text-shadow: none;
-    }
-
-    .wrapper ul > li:hover {
-      border: {
-        top: 1px solid #444;
-        bottom: 1px solid #444;
-      }
-      padding: {
-        top: 5px;
-        bottom: 5px;
-      }
-
-      &.divider {
-        padding-bottom: 3px;
-      }
-
-      a {
-        color: #ccc;
-      }
-    }
-
-    .wrapper ul > li,
-    .wrapper ul > li * {
-      cursor: pointer;
-    }
-  }
-}
-