diff --git a/src/components/partials/EquipmentItem.js b/src/components/partials/EquipmentItem.js
index 10875585..5ecc5500 100644
--- a/src/components/partials/EquipmentItem.js
+++ b/src/components/partials/EquipmentItem.js
@@ -4,20 +4,17 @@ import {connect} from 'react-redux';
 import PropTypes from 'prop-types';
 import {Helmet} from 'react-helmet';
 
-
 // Actions
 import {getLanguageSlug} from 'actions/LanguageActions';
 
 // Components
-import Release from 'components/partials/Portfolio/Release';
-
-// Template
 import ExpansionPanel from 'components/template/ExpansionPanel';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
 import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+import Release from 'components/partials/Portfolio/Release';
 
 // Helpers
 import {getInstrumentReleases} from 'helpers/instrumentReleases';
diff --git a/src/components/partials/LatestPosts.js b/src/components/partials/LatestPosts.js
index bc2415e9..1e9bd4da 100644
--- a/src/components/partials/LatestPosts.js
+++ b/src/components/partials/LatestPosts.js
@@ -3,11 +3,9 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 
 // Components
-import Post from 'components/partials/Post';
-
-// Template
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
+import Post from 'components/partials/Post';
 
 // Data
 import {latestPosts} from 'data/posts';
diff --git a/src/components/partials/LatestProducts.js b/src/components/partials/LatestProducts.js
index a57999cf..b8f0735b 100644
--- a/src/components/partials/LatestProducts.js
+++ b/src/components/partials/LatestProducts.js
@@ -3,11 +3,9 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 
 // Components
-import Product from 'components/partials/Product';
-
-// Template
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
+import Product from 'components/partials/Product';
 
 // Helpers
 import {convertToUrlFriendlyString} from 'helpers/urlFormatter'
diff --git a/src/components/partials/LatestReleases.js b/src/components/partials/LatestReleases.js
index 6786b8be..b4419054 100644
--- a/src/components/partials/LatestReleases.js
+++ b/src/components/partials/LatestReleases.js
@@ -3,11 +3,9 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 
 // Components
-import Release from 'components/partials/Portfolio/Release';
-
-// Template
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
+import Release from 'components/partials/Portfolio/Release';
 
 // Data
 import {latestReleases} from 'data/portfolio';
diff --git a/src/components/partials/LatestVideos.js b/src/components/partials/LatestVideos.js
index 83b4e1c5..b57b7147 100644
--- a/src/components/partials/LatestVideos.js
+++ b/src/components/partials/LatestVideos.js
@@ -3,15 +3,13 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 
 // Components
+import List from 'components/template/List';
+import ListItem from 'components/template/List/ListItem';
 import Video from 'components/partials/Video';
 
 // Helpers
 import {convertToUrlFriendlyString} from 'helpers/urlFormatter'
 
-// Template
-import List from 'components/template/List';
-import ListItem from 'components/template/List/ListItem';
-
 // Data
 import {latestVideos} from 'data/videos';
 
diff --git a/src/components/partials/Portfolio/Release.js b/src/components/partials/Portfolio/Release.js
index 07c14591..ba034013 100644
--- a/src/components/partials/Portfolio/Release.js
+++ b/src/components/partials/Portfolio/Release.js
@@ -5,17 +5,15 @@ import {Helmet} from 'react-helmet';
 import PropTypes from 'prop-types';
 
 // Components
-import ReleaseLinks from 'components/partials/Portfolio/ReleaseLinks';
 import EquipmentItem from 'components/partials/EquipmentItem';
-
-// Template
 import ExpansionPanel from 'components/template/ExpansionPanel';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
-import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
 import ListItemContentBody from 'components/template/List/ListItem/ListItemContent/ListItemContentBody';
+import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+import ReleaseLinks from 'components/partials/Portfolio/ReleaseLinks';
 
 // Actions
 import {fetchReleasesThumbnail} from 'actions/PortfolioActions';
diff --git a/src/components/partials/Post.js b/src/components/partials/Post.js
index dada3a13..29f6b474 100644
--- a/src/components/partials/Post.js
+++ b/src/components/partials/Post.js
@@ -13,13 +13,11 @@ import {convertToUrlFriendlyString} from 'helpers/urlFormatter'
 
 // Components
 import Button from 'components/partials/Button';
-
-// Template
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+import ListItemActionButtons from 'components/template/List/ListItem/ListItemActionButtons';
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
-import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
 import ListItemContentBody from 'components/template/List/ListItem/ListItemContent/ListItemContentBody';
-import ListItemActionButtons from 'components/template/List/ListItem/ListItemActionButtons';
+import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 
 
 class Post extends Component {
diff --git a/src/components/partials/Product.js b/src/components/partials/Product.js
index 2e5dbd22..dca24d81 100644
--- a/src/components/partials/Product.js
+++ b/src/components/partials/Product.js
@@ -12,13 +12,11 @@ import {convertToUrlFriendlyString} from 'helpers/urlFormatter'
 
 // Components
 import Button from 'components/partials/Button';
-
-// Template
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+import ListItemActionButtons from 'components/template/List/ListItem/ListItemActionButtons';
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
-import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
 import ListItemContentBody from 'components/template/List/ListItem/ListItemContent/ListItemContentBody';
-import ListItemActionButtons from 'components/template/List/ListItem/ListItemActionButtons';
+import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 
 
 class Product extends Component {
diff --git a/src/components/partials/SearchResult.js b/src/components/partials/SearchResult.js
index 824b6784..8c71c231 100644
--- a/src/components/partials/SearchResult.js
+++ b/src/components/partials/SearchResult.js
@@ -7,11 +7,11 @@ import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {getLanguageSlug} from 'actions/LanguageActions';
 import {updateSearchResults} from 'actions/SearchResultsActions';
 
-// Template
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+// Components
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
-import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
 import ListItemContentBody from 'components/template/List/ListItem/ListItemContent/ListItemContentBody';
+import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 
 // Stylesheets
 import style from 'components/partials/SearchResult.module.scss';
diff --git a/src/components/partials/Video.js b/src/components/partials/Video.js
index 0b852bbb..dbd2e778 100644
--- a/src/components/partials/Video.js
+++ b/src/components/partials/Video.js
@@ -11,12 +11,12 @@ import {getPrettyDate} from 'helpers/dateFormatter';
 import {convertToUrlFriendlyString} from 'helpers/urlFormatter'
 import {convertStringToExcerpt} from 'helpers/search';
 
-// Template
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
-import ListItemVideo from 'components/template/List/ListItem/ListItemVideo';
+// Components
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
-import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
 import ListItemContentBody from 'components/template/List/ListItem/ListItemContent/ListItemContentBody';
+import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
+import ListItemVideo from 'components/template/List/ListItem/ListItemVideo';
 
 
 class Video extends Component {
diff --git a/src/components/routes/Equipment.js b/src/components/routes/Equipment.js
index e082194c..83795920 100644
--- a/src/components/routes/Equipment.js
+++ b/src/components/routes/Equipment.js
@@ -5,16 +5,14 @@ import {Helmet} from 'react-helmet';
 import { Redirect} from 'react-router-dom';
 
 // Components
-import EquipmentItem from 'components/partials/EquipmentItem';
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-
-// Template
 import Container from 'components/template/Container';
+import EquipmentItem from 'components/partials/EquipmentItem';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
-import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 import ListItemContent from 'components/template/List/ListItem/ListItemContent';
 import ListItemContentHeader from 'components/template/List/ListItem/ListItemContent/ListItemContentHeader';
+import ListItemThumbnail from 'components/template/List/ListItem/ListItemThumbnail';
 import Modal from 'components/template/Modal';
 
 // Actions
diff --git a/src/components/routes/Home.js b/src/components/routes/Home.js
index cc908498..aa73d9d6 100644
--- a/src/components/routes/Home.js
+++ b/src/components/routes/Home.js
@@ -8,16 +8,14 @@ import {Link} from 'react-router-dom';
 import {getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey} from 'actions/LanguageActions';
 
 // Components
-import IntroContent from 'components/partials/IntroContent';
 import Button from 'components/partials/Button';
-import SocialMediaLinks from 'components/partials/SocialMediaLinks';
+import Container from 'components/template/Container';
+import IntroContent from 'components/partials/IntroContent';
 import LatestPosts from 'components/partials/LatestPosts';
-import LatestVideos from 'components/partials/LatestVideos';
 import LatestProducts from 'components/partials/LatestProducts';
 import LatestReleases from 'components/partials/LatestReleases';
-
-// Template
-import Container from 'components/template/Container';
+import LatestVideos from 'components/partials/LatestVideos';
+import SocialMediaLinks from 'components/partials/SocialMediaLinks';
 
 // Assets
 import DehliMusikkLogo from 'assets/svg/DehliMusikkLogoInverse.svg'
diff --git a/src/components/routes/Portfolio.js b/src/components/routes/Portfolio.js
index e6b73922..b6484ad2 100644
--- a/src/components/routes/Portfolio.js
+++ b/src/components/routes/Portfolio.js
@@ -5,14 +5,12 @@ import {Helmet} from 'react-helmet';
 import {Redirect} from 'react-router-dom';
 
 // Components
-import Release from 'components/partials/Portfolio/Release';
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-
-// Template
 import Container from 'components/template/Container';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
 import Modal from 'components/template/Modal';
+import Release from 'components/partials/Portfolio/Release';
 
 // Actions
 import { getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey } from 'actions/LanguageActions';
diff --git a/src/components/routes/Posts.js b/src/components/routes/Posts.js
index eec8ac24..92cdfc2e 100644
--- a/src/components/routes/Posts.js
+++ b/src/components/routes/Posts.js
@@ -5,14 +5,12 @@ import {Helmet} from 'react-helmet';
 import {Redirect} from 'react-router-dom';
 
 // Components
-import Post from 'components/partials/Post';
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-
-// Template
 import Container from 'components/template/Container';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
 import Modal from 'components/template/Modal';
+import Post from 'components/partials/Post';
 
 // Actions
 import {getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey} from 'actions/LanguageActions';
diff --git a/src/components/routes/Products.js b/src/components/routes/Products.js
index 3be70817..d975d7a2 100644
--- a/src/components/routes/Products.js
+++ b/src/components/routes/Products.js
@@ -5,14 +5,12 @@ import {Helmet} from 'react-helmet';
 import {Redirect} from 'react-router-dom';
 
 // Components
-import Product from 'components/partials/Product';
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-
-// Template
 import Container from 'components/template/Container';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
 import Modal from 'components/template/Modal';
+import Product from 'components/partials/Product';
 
 // Actions
 import {getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey} from 'actions/LanguageActions';
diff --git a/src/components/routes/Search.js b/src/components/routes/Search.js
index 2f44d2e0..6d715098 100644
--- a/src/components/routes/Search.js
+++ b/src/components/routes/Search.js
@@ -5,15 +5,12 @@ import {Helmet} from 'react-helmet';
 import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
 import {Redirect} from 'react-router-dom';
 
-
 // Components
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-import SearchResult from 'components/partials/SearchResult';
-
-// Template
 import Container from 'components/template/Container';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
+import SearchResult from 'components/partials/SearchResult';
 
 // Actions
 import {getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey} from 'actions/LanguageActions';
diff --git a/src/components/routes/Videos.js b/src/components/routes/Videos.js
index 6153bc75..81772fec 100644
--- a/src/components/routes/Videos.js
+++ b/src/components/routes/Videos.js
@@ -5,14 +5,12 @@ import {Helmet} from 'react-helmet';
 import {Redirect} from 'react-router-dom';
 
 // Components
-import Video from 'components/partials/Video';
 import Breadcrumbs from 'components/partials/Breadcrumbs';
-
-// Template
 import Container from 'components/template/Container';
 import List from 'components/template/List';
 import ListItem from 'components/template/List/ListItem';
 import Modal from 'components/template/Modal';
+import Video from 'components/partials/Video';
 
 // Actions
 import {getLanguageSlug, updateMultilingualRoutes, updateSelectedLanguageKey} from 'actions/LanguageActions';