diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..87ea22b9b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: csharp
+solution: src/NzbDrone.sln
+script:    # the following commands are just examples, use whatever your build process requires
+  - ./build.sh
+  - chmod +x test.sh
+#  - ./test.sh Linux Unit Takes far too long, maybe even crashes travis :/
+install:
+  - sudo apt-get install nodejs
+  - sudo apt-get install npm
diff --git a/readme.md b/readme.md
index c1aa3d5a9..c615441d6 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# Radarr #
+# Radarr [![Build Status](https://travis-ci.org/galli-leo/Radarr.svg?branch=develop)](https://travis-ci.org/galli-leo/Radarr)#
 
 This fork of Sonarr aims to turn it into something like Couchpotato.
 
diff --git a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs b/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs
index d613a52d4..0928c0f38 100644
--- a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs
+++ b/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs
@@ -1,5 +1,5 @@
 <div class="x-existing-folders">
     <div class="loading-folders x-loading-folders">
-        Loading search results from TheTVDB for your series, this may take a few minutes.
+        Loading search results from TheTVDB for your movies, this may take a few minutes.
     </div>
 </div>
\ No newline at end of file
diff --git a/src/UI/AddMovies/NotFoundViewTemplate.hbs b/src/UI/AddMovies/NotFoundViewTemplate.hbs
index e2d99bb63..7cc6eb25a 100644
--- a/src/UI/AddMovies/NotFoundViewTemplate.hbs
+++ b/src/UI/AddMovies/NotFoundViewTemplate.hbs
@@ -2,6 +2,6 @@
     <h3>
         Sorry. We couldn't find any movies matching '{{term}}'
     </h3>
-    <a href="https://github.com/NzbDrone/NzbDrone/wiki/FAQ#wiki-why-cant-i-add-a-new-show-to-nzbdrone-its-on-thetvdb">Why can't I find my show?</a>
+    <a href="https://github.com/NzbDrone/NzbDrone/wiki/FAQ#wiki-why-cant-i-add-a-new-show-to-nzbdrone-its-on-thetvdb">[UPDATE LINK] Why can't I find my movie?</a>
 
 </div>
diff --git a/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js b/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js
index f781f21d7..f0704f342 100644
--- a/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js
+++ b/src/UI/AddMovies/RootFolders/RootFolderCollectionView.js
@@ -2,7 +2,7 @@ var Marionette = require('marionette');
 var RootFolderItemView = require('./RootFolderItemView');
 
 module.exports = Marionette.CompositeView.extend({
-    template          : 'AddSeries/RootFolders/RootFolderCollectionViewTemplate',
+    template          : 'AddMovies/RootFolders/RootFolderCollectionViewTemplate',
     itemViewContainer : '.x-root-folders',
     itemView          : RootFolderItemView
 });
\ No newline at end of file
diff --git a/src/UI/AddMovies/RootFolders/RootFolderItemView.js b/src/UI/AddMovies/RootFolders/RootFolderItemView.js
index a0e98100b..7397f4e94 100644
--- a/src/UI/AddMovies/RootFolders/RootFolderItemView.js
+++ b/src/UI/AddMovies/RootFolders/RootFolderItemView.js
@@ -1,7 +1,7 @@
 var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
-    template  : 'AddSeries/RootFolders/RootFolderItemViewTemplate',
+    template  : 'AddMovies/RootFolders/RootFolderItemViewTemplate',
     className : 'recent-folder',
     tagName   : 'tr',
 
diff --git a/src/UI/AddMovies/RootFolders/RootFolderLayout.js b/src/UI/AddMovies/RootFolders/RootFolderLayout.js
index 6dae383d7..f48890076 100644
--- a/src/UI/AddMovies/RootFolders/RootFolderLayout.js
+++ b/src/UI/AddMovies/RootFolders/RootFolderLayout.js
@@ -7,7 +7,7 @@ var AsValidatedView = require('../../Mixins/AsValidatedView');
 require('../../Mixins/FileBrowser');
 
 var Layout = Marionette.Layout.extend({
-    template : 'AddSeries/RootFolders/RootFolderLayoutTemplate',
+    template : 'AddMovies/RootFolders/RootFolderLayoutTemplate',
 
     ui : {
         pathInput : '.x-path'
diff --git a/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs b/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs
index 83cb9535d..1d6eae265 100644
--- a/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs
+++ b/src/UI/AddMovies/RootFolders/RootFolderLayoutTemplate.hbs
@@ -5,7 +5,7 @@
     </div>
     <div class="modal-body root-folders-modal">
         <div class="validation-errors"></div>
-        <div class="alert alert-info">Enter the path that contains some or all of your TV series, you will be able to choose which series you want to import<button type="button" class="close" data-dismiss="alert">×</button></div>
+        <div class="alert alert-info">Enter the path that contains some or all of your movies, you will be able to choose which movies you want to import<button type="button" class="close" data-dismiss="alert">×</button></div>
 
         <div class="row">
             <div class="form-group">
@@ -14,7 +14,7 @@
 
                     <div class="input-group">
                         <span class="input-group-addon">&nbsp;<i class="icon-sonarr-folder-open"></i></span>
-                        <input class="form-control x-path" type="text" validation-name="path" placeholder="Enter path to folder that contains your shows">
+                        <input class="form-control x-path" type="text" validation-name="path" placeholder="Enter path to folder that contains your movies">
                         <span class="input-group-btn"><button class="btn btn-success x-add"><i class="icon-sonarr-ok"/></button></span>
                     </div>
                 </div>
diff --git a/src/UI/Movies/Details/EpisodeNumberCell.js b/src/UI/Movies/Details/EpisodeNumberCell.js
index 9a84e644e..4e09a7603 100644
--- a/src/UI/Movies/Details/EpisodeNumberCell.js
+++ b/src/UI/Movies/Details/EpisodeNumberCell.js
@@ -5,7 +5,7 @@ var SeriesCollection = require('../SeriesCollection');
 
 module.exports = NzbDroneCell.extend({
     className : 'episode-number-cell',
-    template  : 'Series/Details/EpisodeNumberCellTemplate',
+    template  : 'Movies/Details/EpisodeNumberCellTemplate',
 
     render : function() {
         this.$el.empty();
diff --git a/src/UI/Movies/Details/InfoView.js b/src/UI/Movies/Details/InfoView.js
index c7fab9fc4..2ac803988 100644
--- a/src/UI/Movies/Details/InfoView.js
+++ b/src/UI/Movies/Details/InfoView.js
@@ -1,7 +1,7 @@
 var Marionette = require('marionette');
 
 module.exports = Marionette.ItemView.extend({
-    template : 'Series/Details/InfoViewTemplate',
+    template : 'Movies/Details/InfoViewTemplate',
 
     initialize : function(options) {
         this.episodeFileCollection = options.episodeFileCollection;
diff --git a/src/UI/Movies/Details/SeasonLayout.js b/src/UI/Movies/Details/SeasonLayout.js
index cf10b6fa8..2638a2b70 100644
--- a/src/UI/Movies/Details/SeasonLayout.js
+++ b/src/UI/Movies/Details/SeasonLayout.js
@@ -15,7 +15,7 @@ var _ = require('underscore');
 var Messenger = require('../../Shared/Messenger');
 
 module.exports = Marionette.Layout.extend({
-    template : 'Series/Details/SeasonLayoutTemplate',
+    template : 'Movies/Details/SeasonLayoutTemplate',
 
     ui : {
         seasonSearch    : '.x-season-search',
diff --git a/src/UI/Movies/Index/EmptyTemplate.hbs b/src/UI/Movies/Index/EmptyTemplate.hbs
index 06fb40fe5..42cb619d2 100644
--- a/src/UI/Movies/Index/EmptyTemplate.hbs
+++ b/src/UI/Movies/Index/EmptyTemplate.hbs
@@ -1,13 +1,13 @@
-<div class="no-series">
+<div class="no-movies">
     <div class="row">
         <div class="well col-md-12">
             <i class="icon-sonarr-comment"/>
-            You must be new around here, You should add some series.
+            You must be new around here, You should add some movies.
         </div>
     </div>
     <div class="row">
         <div class="col-md-4 col-md-offset-4">
-            <a href="/addmovies" class='btn btn-lg btn-block btn-success x-add-series'>
+            <a href="/addmovies" class='btn btn-lg btn-block btn-success x-add-movies'>
                 <i class='icon-sonarr-add'></i>
                 Add Movie
             </a>
diff --git a/src/UI/Movies/Index/EmptyView.js b/src/UI/Movies/Index/EmptyView.js
index 01dcc07a4..ef1393355 100644
--- a/src/UI/Movies/Index/EmptyView.js
+++ b/src/UI/Movies/Index/EmptyView.js
@@ -1,5 +1,5 @@
 var Marionette = require('marionette');
 
 module.exports = Marionette.CompositeView.extend({
-    template : 'Series/Index/EmptyTemplate'
+    template : 'Movies/Index/EmptyTemplate'
 });
\ No newline at end of file
diff --git a/src/UI/Movies/Index/FooterView.js b/src/UI/Movies/Index/FooterView.js
index 1d31cc404..c025a3be1 100644
--- a/src/UI/Movies/Index/FooterView.js
+++ b/src/UI/Movies/Index/FooterView.js
@@ -1,5 +1,5 @@
 var Marionette = require('marionette');
 
 module.exports = Marionette.CompositeView.extend({
-    template : 'Series/Index/FooterViewTemplate'
+    template : 'Movies/Index/FooterViewTemplate'
 });
\ No newline at end of file
diff --git a/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js b/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js
index 7db4b76f0..d77741892 100644
--- a/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js
+++ b/src/UI/Movies/Index/Overview/SeriesOverviewCollectionView.js
@@ -4,5 +4,5 @@ var ListItemView = require('./SeriesOverviewItemView');
 module.exports = Marionette.CompositeView.extend({
     itemView          : ListItemView,
     itemViewContainer : '#x-series-list',
-    template          : 'Series/Index/Overview/SeriesOverviewCollectionViewTemplate'
+    template          : 'Movies/Index/Overview/SeriesOverviewCollectionViewTemplate'
 });
\ No newline at end of file