diff --git a/assets/sass/base/_all.sass b/assets/sass/base/_all.sass
deleted file mode 100644
index 2ba3f4c8..00000000
--- a/assets/sass/base/_all.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-@import 'code'
-@import 'layout'
-@import 'typography'
diff --git a/assets/sass/components/_all.sass b/assets/sass/components/_all.sass
deleted file mode 100644
index 0e48c3fe..00000000
--- a/assets/sass/components/_all.sass
+++ /dev/null
@@ -1,7 +0,0 @@
-@import 'availability'
-@import 'badges'
-@import 'content-types/blog-post'
-@import 'content-types/talk'
-@import 'footer'
-@import 'meetups'
-@import 'testimonials'
diff --git a/assets/sass/components/_testimonials.sass b/assets/sass/components/_testimonials.sass
index 6d994adc..eaca8768 100644
--- a/assets/sass/components/_testimonials.sass
+++ b/assets/sass/components/_testimonials.sass
@@ -6,12 +6,10 @@
         color: #777
 
     &__image
-        @extend .img-circle
-        @extend .pull-right
         height: 75px
         margin: 0 0 10px 10px
         width: 75px
 
-        +breakpoint($screen-sm)
+        +until($screen-sm)
             height: 90px
             width: 90px
diff --git a/assets/sass/pages/_all.sass b/assets/sass/pages/_all.sass
deleted file mode 100644
index 1c706c3e..00000000
--- a/assets/sass/pages/_all.sass
+++ /dev/null
@@ -1,6 +0,0 @@
-@import 'about'
-@import 'blog-list'
-@import 'blog-post'
-@import 'experience'
-@import 'projects'
-@import 'talk'
diff --git a/assets/sass/pages/_experience.sass b/assets/sass/pages/_experience.sass
index 49d0fa4b..0b10d4c2 100644
--- a/assets/sass/pages/_experience.sass
+++ b/assets/sass/pages/_experience.sass
@@ -17,6 +17,8 @@
         margin-left: 1.5em
         margin-top: 25px
         max-width: 25%
+        +desktop
+            max-width: 15%
 
     img
         height: auto
@@ -24,7 +26,3 @@
 
     p:last-of-type
         margin-bottom: 0
-
-    +breakpoint(30rem)
-        &__logo
-            max-width: 15%
diff --git a/assets/sass/site.sass b/assets/sass/site.sass
index 6e29d101..52b8c5fb 100644
--- a/assets/sass/site.sass
+++ b/assets/sass/site.sass
@@ -1,8 +1,23 @@
 @import '../../vendor/bower_components/bootstrap-sass/assets/stylesheets/bootstrap'
-@import '../../vendor/bower_components/compass-breakpoint/stylesheets/breakpoint'
 
 @import 'base'
 @import 'mixins'
-@import 'base/all'
-@import 'components/all'
-@import 'pages/all'
+
+@import 'base/layout'
+@import 'base/typography'
+@import 'base/code'
+
+@import 'components/availability'
+@import 'components/badges'
+@import 'components/content-types/blog-post'
+@import 'components/content-types/talk'
+@import 'components/footer'
+@import 'components/meetups'
+@import 'components/testimonials'
+
+@import 'pages/about'
+@import 'pages/blog-list'
+@import 'pages/blog-post'
+@import 'pages/experience'
+@import 'pages/projects'
+@import 'pages/talk'
diff --git a/bower.json b/bower.json
index 86a4f389..12927282 100644
--- a/bower.json
+++ b/bower.json
@@ -2,7 +2,6 @@
   "name": "oliverdavies.uk",
   "devDependencies": {
     "bootstrap-sass": "~3.3.6",
-    "compass-breakpoint": "breakpoint-sass#~2.6.1",
     "font-awesome": "fontawesome#~4.5.0",
     "jquery2": "^2.0.0",
     "prism": "prismjs#^1.6.0"
diff --git a/source/testimonials.twig b/source/testimonials.twig
index b14c5d8b..f6632b23 100644
--- a/source/testimonials.twig
+++ b/source/testimonials.twig
@@ -95,7 +95,7 @@ use: [posts]
             <h2 class="testimonial__name">{{ testimonial.name }}</h2>
 
             {% if testimonial.image %}
-                <img class="testimonial__image" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
+                <img class="testimonial__image pull-right img-circle" src="{{ site.url }}/assets/images/testimonials/{{ testimonial.image }}" alt="{{ testimonial.name }}"/>
             {% endif %}
 
             {% if testimonial.role and company.name is not defined %}