diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedAcitivty.java b/app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedActivity.java
similarity index 93%
rename from app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedAcitivty.java
rename to app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedActivity.java
index 3a912240..809814bc 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedAcitivty.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/AbstractServiceConnectedActivity.java
@@ -17,7 +17,7 @@ import io.reactivex.Single;
  * Created by felix on 24.03.17.
  */
 
-public class AbstractServiceConnectedAcitivty extends Activity {
+public class AbstractServiceConnectedActivity extends Activity {
 	private MediaApiService mMediaApiService = null;
 	private ServiceConnection conn;
 	private boolean mConnected = false;
@@ -63,7 +63,7 @@ public class AbstractServiceConnectedAcitivty extends Activity {
 						mConnected = false;
 					}
 				};
-				AbstractServiceConnectedAcitivty.this.bindService(s, conn, Context.BIND_AUTO_CREATE);
+				AbstractServiceConnectedActivity.this.bindService(s, conn, Context.BIND_AUTO_CREATE);
 			}
 		});
 	}
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/ConferencesActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/ConferencesActivity.java
index a20617c3..d838256f 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/ConferencesActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/ConferencesActivity.java
@@ -8,7 +8,7 @@ import de.nicidienase.chaosflix.R;
  * Created by felix on 18.03.17.
  */
 
-public class ConferencesActivity extends AbstractServiceConnectedAcitivty {
+public class ConferencesActivity extends AbstractServiceConnectedActivity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/DetailsActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/DetailsActivity.java
index d2e12cfd..48546943 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/DetailsActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/DetailsActivity.java
@@ -21,7 +21,7 @@ import de.nicidienase.chaosflix.R;
 /*
  * Details activity class that loads LeanbackDetailsFragment class
  */
-public class DetailsActivity extends AbstractServiceConnectedAcitivty {
+public class DetailsActivity extends AbstractServiceConnectedActivity {
 
 	public static final String SHARED_ELEMENT_NAME = "hero";
 	public static final String EVENT = "event";
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/EventDetailsActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/EventDetailsActivity.java
index 33f00dc9..9e3f6403 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/EventDetailsActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/EventDetailsActivity.java
@@ -9,7 +9,7 @@ import de.nicidienase.chaosflix.R;
  * Created by felix on 18.03.17.
  */
 
-public class EventDetailsActivity extends AbstractServiceConnectedAcitivty {
+public class EventDetailsActivity extends AbstractServiceConnectedActivity {
 
 	public static final String EVENT = "event";
 	public static final String SHARED_ELEMENT_NAME = "transision_element";
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/EventsActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/EventsActivity.java
index 3d8243a5..3c549a05 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/EventsActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/EventsActivity.java
@@ -4,7 +4,7 @@ import android.os.Bundle;
 
 import de.nicidienase.chaosflix.R;
 
-public class EventsActivity extends AbstractServiceConnectedAcitivty {
+public class EventsActivity extends AbstractServiceConnectedActivity {
 
 	public static final String CONFERENCE_ID = "conference_id";
 	public static final String CONFERENCE = "conference";
diff --git a/app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java b/app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java
index 31b2cbdd..20b71371 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/activities/PlayerActivity.java
@@ -48,7 +48,7 @@ import de.nicidienase.chaosflix.fragments.OverlayFragment;
  * Created by felix on 26.03.17.
  */
 
-public class PlayerActivity extends AbstractServiceConnectedAcitivty
+public class PlayerActivity extends AbstractServiceConnectedActivity
 		implements OverlayFragment.PlaybackControlListener {
 
 	private static final String TAG = PlayerActivity.class.getSimpleName();
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
index 2c5b00eb..0d6cd1f9 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesBrowseFragment.java
@@ -20,7 +20,7 @@ import de.nicidienase.chaosflix.BuildConfig;
 import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
+import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
 import de.nicidienase.chaosflix.entities.WatchlistItem;
 import de.nicidienase.chaosflix.entities.recording.Conference;
 import de.nicidienase.chaosflix.entities.recording.ConferencesWrapper;
@@ -68,7 +68,7 @@ public class ConferencesBrowseFragment extends BrowseFragment {
 		mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
 		watchListAdapter = new ArrayObjectAdapter(cardPresenter);
 
-		Disposable disposable = ((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		Disposable disposable = ((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.subscribe(mediaApiService -> {
 					mDisposables.add(Observable.zip(mediaApiService.getStreamingConferences(),
 							mediaApiService.getConferences(),
@@ -165,7 +165,7 @@ public class ConferencesBrowseFragment extends BrowseFragment {
 	}
 
 	private Disposable updateWatchlist(List<WatchlistItem> watchlistItems) {
-		return ((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		return ((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.observeOn(AndroidSchedulers.mainThread())
 				.subscribe(mediaApiService -> {
 					showWatchlist();
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
index 4ba71485..d56b5b5e 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/ConferencesGridFragment.java
@@ -11,7 +11,7 @@ import java.util.List;
 
 import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
-import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
+import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
 import de.nicidienase.chaosflix.entities.recording.Conference;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 
@@ -29,7 +29,7 @@ public class ConferencesGridFragment extends VerticalGridFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.subscribe(mediaApiService -> {
 					mediaApiService.getConferences()
 							.observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
index fe5e7fe7..5a6c628a 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsBrowseFragment.java
@@ -48,7 +48,7 @@ import java.util.TimerTask;
 import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
+import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
 import de.nicidienase.chaosflix.activities.EventsActivity;
 import de.nicidienase.chaosflix.entities.recording.Conference;
 import de.nicidienase.chaosflix.entities.recording.Event;
@@ -79,7 +79,7 @@ public class EventsBrowseFragment extends BrowseFragment {
 		conferenceId = this.getActivity().getIntent().getIntExtra(EventsActivity.CONFERENCE_ID, 0);
 		mConference = this.getActivity().getIntent().getParcelableExtra(EventsActivity.CONFERENCE);
 
-		((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.subscribe(mediaApiService -> {
 					mediaApiService.getConference(mConference.getApiID())
 							.observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
index c25fc09c..e935f86e 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/EventsDetailsFragment.java
@@ -42,7 +42,7 @@ import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.EventDetailsDescriptionPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
+import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
 import de.nicidienase.chaosflix.activities.ConferencesActivity;
 import de.nicidienase.chaosflix.activities.DetailsActivity;
 import de.nicidienase.chaosflix.activities.EventDetailsActivity;
@@ -174,7 +174,7 @@ public class EventsDetailsFragment extends DetailsFragment {
 		mPresenterSelector.addClassPresenter(ListRow.class, new ListRowPresenter());
 		final ArrayObjectAdapter adapter = new ArrayObjectAdapter(mPresenterSelector);
 
-		((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.doOnError(t -> browseErrorFragment.setErrorContent(t.getMessage()))
 				.subscribe(mediaApiService -> {
 					mMediaApiService = mediaApiService;
diff --git a/app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java b/app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java
index f243b112..4774c748 100644
--- a/app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java
+++ b/app/src/main/java/de/nicidienase/chaosflix/fragments/OverlayFragment.java
@@ -26,7 +26,7 @@ import de.nicidienase.chaosflix.CardPresenter;
 import de.nicidienase.chaosflix.ItemViewClickedListener;
 import de.nicidienase.chaosflix.PlaybackHelper;
 import de.nicidienase.chaosflix.R;
-import de.nicidienase.chaosflix.activities.AbstractServiceConnectedAcitivty;
+import de.nicidienase.chaosflix.activities.AbstractServiceConnectedActivity;
 import de.nicidienase.chaosflix.activities.DetailsActivity;
 import de.nicidienase.chaosflix.entities.PlaybackProgress;
 import de.nicidienase.chaosflix.entities.recording.Event;
@@ -229,7 +229,7 @@ public class OverlayFragment extends PlaybackFragment {
 	private Row getRelatedItems() {
 		ArrayObjectAdapter listRowAdapter = new ArrayObjectAdapter(new CardPresenter());
 		final long[] related = mSelectedEvent.getMetadata().getRelated();
-		mDisposables.add(((AbstractServiceConnectedAcitivty) getActivity()).getmApiServiceObservable()
+		mDisposables.add(((AbstractServiceConnectedActivity) getActivity()).getmApiServiceObservable()
 				.observeOn(AndroidSchedulers.mainThread())
 				.subscribe(
 						mediaApiService -> {
diff --git a/build.gradle b/build.gradle
index 7922b5f0..df9de24d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'me.tatarka:gradle-retrolambda:3.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong