diff --git a/angular.json b/angular.json
index 48be5c37..fdaa566c 100644
--- a/angular.json
+++ b/angular.json
@@ -127,7 +127,7 @@
   "schematics": {
     "@schematics/angular:component": {
       "prefix": "app",
-      "styleext": "css"
+      "styleext": "scss"
     },
     "@schematics/angular:directive": {
       "prefix": "app"
diff --git a/src/app/app.component.css b/src/app/app.component.scss
similarity index 100%
rename from src/app/app.component.css
rename to src/app/app.component.scss
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 856e2b4f..1c651c25 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,7 +5,7 @@ import { ElectronService } from 'ngx-electron';
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
   title = 'app';
diff --git a/src/app/components/left-side-bar/left-side-bar.component.css b/src/app/components/left-side-bar/left-side-bar.component.scss
similarity index 100%
rename from src/app/components/left-side-bar/left-side-bar.component.css
rename to src/app/components/left-side-bar/left-side-bar.component.scss
diff --git a/src/app/components/left-side-bar/left-side-bar.component.ts b/src/app/components/left-side-bar/left-side-bar.component.ts
index 23928172..b2d4e5a2 100644
--- a/src/app/components/left-side-bar/left-side-bar.component.ts
+++ b/src/app/components/left-side-bar/left-side-bar.component.ts
@@ -7,7 +7,7 @@ import { AccountsService, LocalAccount } from "../../services/accounts.service";
 @Component({
   selector: "app-left-side-bar",
   templateUrl: "./left-side-bar.component.html",
-  styleUrls: ["./left-side-bar.component.css"]
+  styleUrls: ["./left-side-bar.component.scss"]
 })
 export class LeftSideBarComponent implements OnInit, OnDestroy {
   accounts: AccountWrapper[] = [];
diff --git a/src/app/components/stream/stream.component.css b/src/app/components/stream/stream.component.scss
similarity index 100%
rename from src/app/components/stream/stream.component.css
rename to src/app/components/stream/stream.component.scss
diff --git a/src/app/components/stream/stream.component.ts b/src/app/components/stream/stream.component.ts
index 6ae53fdd..7d59d34b 100644
--- a/src/app/components/stream/stream.component.ts
+++ b/src/app/components/stream/stream.component.ts
@@ -5,7 +5,7 @@ import { AccountWrapper } from "../../models/account.models";
 @Component({
   selector: "app-stream",
   templateUrl: "./stream.component.html",
-  styleUrls: ["./stream.component.css"]
+  styleUrls: ["./stream.component.scss"]
 })
 export class StreamComponent implements OnInit {
   private _stream: Stream;
diff --git a/src/app/components/streams-selection-footer/streams-selection-footer.component.css b/src/app/components/streams-selection-footer/streams-selection-footer.component.scss
similarity index 100%
rename from src/app/components/streams-selection-footer/streams-selection-footer.component.css
rename to src/app/components/streams-selection-footer/streams-selection-footer.component.scss
diff --git a/src/app/components/streams-selection-footer/streams-selection-footer.component.ts b/src/app/components/streams-selection-footer/streams-selection-footer.component.ts
index ab96e4de..8d18c4af 100644
--- a/src/app/components/streams-selection-footer/streams-selection-footer.component.ts
+++ b/src/app/components/streams-selection-footer/streams-selection-footer.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
 @Component({
   selector: 'app-streams-selection-footer',
   templateUrl: './streams-selection-footer.component.html',
-  styleUrls: ['./streams-selection-footer.component.css']
+  styleUrls: ['./streams-selection-footer.component.scss']
 })
 export class StreamsSelectionFooterComponent implements OnInit {
 
diff --git a/src/app/components/toot/toot.component.css b/src/app/components/toot/toot.component.scss
similarity index 100%
rename from src/app/components/toot/toot.component.css
rename to src/app/components/toot/toot.component.scss
diff --git a/src/app/components/toot/toot.component.ts b/src/app/components/toot/toot.component.ts
index d67441b1..0496164b 100644
--- a/src/app/components/toot/toot.component.ts
+++ b/src/app/components/toot/toot.component.ts
@@ -4,7 +4,7 @@ import { TootWrapper } from "../../models/stream.models";
 @Component({
   selector: "app-toot",
   templateUrl: "./toot.component.html",
-  styleUrls: ["./toot.component.css"]
+  styleUrls: ["./toot.component.scss"]
 })
 export class TootComponent implements OnInit {
   @Input() toot: TootWrapper;
diff --git a/src/app/pages/register-new-account/register-new-account.component.css b/src/app/pages/register-new-account/register-new-account.component.scss
similarity index 100%
rename from src/app/pages/register-new-account/register-new-account.component.css
rename to src/app/pages/register-new-account/register-new-account.component.scss
diff --git a/src/app/pages/register-new-account/register-new-account.component.ts b/src/app/pages/register-new-account/register-new-account.component.ts
index d90ae5dc..23d53518 100644
--- a/src/app/pages/register-new-account/register-new-account.component.ts
+++ b/src/app/pages/register-new-account/register-new-account.component.ts
@@ -10,7 +10,7 @@ import { Observable } from "rxjs";
 @Component({
   selector: "app-register-new-account",
   templateUrl: "./register-new-account.component.html",
-  styleUrls: ["./register-new-account.component.css"]
+  styleUrls: ["./register-new-account.component.scss"]
 })
 export class RegisterNewAccountComponent implements OnInit {
   @Input() mastodonFullHandle: string;
diff --git a/src/app/pages/streams-main-display/streams-main-display.component.css b/src/app/pages/streams-main-display/streams-main-display.component.scss
similarity index 100%
rename from src/app/pages/streams-main-display/streams-main-display.component.css
rename to src/app/pages/streams-main-display/streams-main-display.component.scss
diff --git a/src/app/pages/streams-main-display/streams-main-display.component.ts b/src/app/pages/streams-main-display/streams-main-display.component.ts
index cb6b7555..e6cf4c9b 100644
--- a/src/app/pages/streams-main-display/streams-main-display.component.ts
+++ b/src/app/pages/streams-main-display/streams-main-display.component.ts
@@ -7,7 +7,7 @@ import { StreamsService } from "../../services/streams.service";
 @Component({
   selector: "app-streams-main-display",
   templateUrl: "./streams-main-display.component.html",
-  styleUrls: ["./streams-main-display.component.css"]
+  styleUrls: ["./streams-main-display.component.scss"]
 })
 export class StreamsMainDisplayComponent implements OnInit {
   streams: Stream[] = [];
diff --git a/src/app/services/app.service.ts b/src/app/services/app.service.ts
index eb45796b..3eb0b009 100644
--- a/src/app/services/app.service.ts
+++ b/src/app/services/app.service.ts
@@ -1,6 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Http, Response, RequestOptions } from '@angular/http';
+import { map } from "rxjs/operators";
+
 import { ApiRoutes } from './models/api.settings';
+import { TokenData } from './models/mastodon.interfaces';
 
 @Injectable()
 export class AppService {
@@ -9,7 +12,7 @@ export class AppService {
     constructor(private readonly httpService: Http) {
     }
 
-    createNewApplication(mastodonUrl: string): Promise<> {
+    createNewApplication(mastodonUrl: string): Promise<any> {
         const url = mastodonUrl + this.apiRoutes.createApp;
 
         const options = new RequestOptions();
@@ -28,10 +31,9 @@ export class AppService {
                 }))
             .toPromise()
 
-
-            .then((res: Response) => {
-                const result = res.json();
-                return result as TokenData;
-            });
+            // .then((res: Response) => {
+            //     const result = res.json(); 
+            //     return result as TokenData;
+            // });
     }
 }
\ No newline at end of file