diff --git a/content/author.blade.php b/content/author.blade.php
index c20e5d1..228b561 100644
--- a/content/author.blade.php
+++ b/content/author.blade.php
@@ -1,11 +1,5 @@
 @extends('template.'.config('settings.template').'.content.master')
 @section('content')
-
-
-
-
-
-
     @if (\Route::currentRouteName() != 'author.get')
         <div class="row" style="margin-top:50px;">
             <div class="mx-auto" style="overflow: scroll">
@@ -13,57 +7,46 @@
                     <label class="btn btn-lg {{ (!isset($categoryModel) and \Request::route()->getName() != 'nachrichten.get' and \Request::route()->getName() != 'author.get') ? 'active btn-primary' : 'btn-outline-primary' }}" onclick="location.href = '{{ url('/')  }}';">
                         <input type="radio" name="options" id="option1" autocomplete="off" checked=""> <i class="fal fa-bookmark" aria-hidden="true"></i> Home
                     </label>
-
                     @foreach ($categories as $category)
                         <label class="btn btn-lg {{ (isset($categoryModel) and $category->id == $categoryModel->id) ? 'active btn-primary' : 'btn-outline-primary' }}" onclick="location.href = '{{ url('/' . $category->slug)  }}';">
                             <input type="radio" name="options" id="option3" autocomplete="off">
-
                             @if($category->icon == 'bitcoin')
                                 <i class="fab fa-{{$category->icon}}"></i>
                             @else
                                 <i class="fal fa-{{$category->icon}}"></i>
                             @endif
-
-
                             {{ $category->name }}
                         </label>
                     @endforeach
                 </div>
             </div>
         </div>
-
         <div class="container">
             <div class="col-12">
                 @if (isset($categoryModel))
                     <br><br>
                     <h1>
-
                         @if($categoryModel->icon == 'bitcoin')
                             <i class="fab fa-{{$categoryModel->icon}}"></i>
                         @else
                             <i class="fal fa-{{$categoryModel->icon}}"></i>
                         @endif
-
                         {{ $categoryModel->name }}</h1>
                 @else
                     <br><br>
-                    <h1>{{ \Setting::get('name')}}</h1>
+                    <h1>{{ config('settings.name')}}</h1>
                 @endif
-
                     <p class="intro">
                         @if (isset($categoryModel))
                             {{ $categoryModel->description }}
                         @else
-                            {{ \Setting::get('description')}}
+                            {{ config('settings.description')}}
                         @endif
                         <br>
-
-
                     </p>
             </div>
         </div>
     @endif
-
     <div class="container">
         <div class="row">
             @if (\Route::currentRouteName() == 'author.get')
@@ -75,28 +58,21 @@
                 <div class="col-sm-12 col-md-10">
                     <br><br>
                     <h1>{{ $author->name }}</h1>
-
-
                     <p class="intro">
                         {{ $author->description }}
                     </p>
-
-
-
                     <div class="row">
                     <div class="col-md-7 col-sm-12">
                         @if (isset($author->social_networks['email']))
                             <a href="mailto:{{ $author->social_networks['email'] }}"><i class="fal fa-envelope"></i></a>
                             |
                         @endif
-
                         @if (isset($author->social_networks['site']))
                             <a href="{{ $author->social_networks['site'] }}">{{ $author->social_networks['site'] }}</a>
                         @endif
                         <br>
                         <br>
                     </div>
-
                     <div class="col-md-5 col-sm-12 text-center">
                         <?php
                             $social = [
@@ -115,28 +91,23 @@
                                 'youtube'
                             ];
                         ?>
-
                         @foreach ($social as $value)
                             @if (isset($author->social_networks[$value]))
                                 <a href="{{ $author->social_networks[$value] }}"><i class="fab fa-{{ $value }}"></i></a>
                             @endif
                         @endforeach
-
                         <br>
                         <br>
                     </div>
-
                     </div>
                 </div>
             @endif
-
             @if (\Route::currentRouteName() == 'welcome')
                 <div class="col-12">
                     <br>
                     <br>
                     <h2 class="h4" class="text-center">{{ __('public.popular-authors') }}</h2>
                 </div>
-
                 @foreach ($authors as $author)
                     <div class="col-4 col-md-2 text-center">
                         <br>
@@ -145,7 +116,6 @@
                         </a>
                     </div>
                 @endforeach
-
                 <!--<div class="col-lg-12" style="text-align: center">
                     <br>
                     <br>
@@ -159,27 +129,16 @@
                     <br>
                     <br>
                 </div>-->
-
                 <div class="col-lg-12">
                     <br>
                     <br>
                     <br>
                 </div>
-
             @endif
         </div>
     </div>
-
-
-
-
     <section id="article-section">
-
-
         <div class="container">
-
-
-
             @if (env('APP_WRITE', false))
                     <br>
                     <br>
@@ -187,16 +146,8 @@
                     <a href="" class="float-right" data-toggle="modal" data-target="#exampleModal"><i class="fal fa-plus"></i> {{ __('public.propose-content') }} Neuen Inhalt einreichen</a>
                     <br>
                     <br>
-
-
                 @endif
-
-
-
-            @include('template.'.\Setting::get('template', 'default').'.content.includes.create-content')
-
-
-
+            @include('template.'.config('settings.template').'.content.includes.create-content')
             <br>
             @if (session()->has('success'))
                 <div class="row justify-content-center">
@@ -215,7 +166,6 @@
                     </div>
                 </div>
             @endif
-
             @if (session()->has('error'))
                 <div class="row justify-content-center">
                     <div class="col-lg-8">
@@ -233,20 +183,13 @@
                     </div>
                 </div>
             @endif
-
             <div class="article-feed">
                     @foreach($nachrichten as $nach)
-
                     <article class="newsentry" style="width: 100%;" data-slug="{{ $nach->category->slug }}/{{ $nach->slug }}">
-
-
                     @if ($nach->paid != 0 and (empty($nach->premium_until) or $nach->premium_until > date('Y-m-d')) and !\Session::get('premium_code'))
                             <div class="col-lg-12">
                                 <div class="card shadow-lg" id="news-{{$nach->id}}">
-
-
                                     <div class="card-body" style="padding-bottom: 0;">
-
                                         @if($nach->created_at->diffInHours(date('Y-m-d H:i:s')) < 1)
                                             <div class="progress" style="height: 30px;">
                                                 <div class="progress-bar progress-bar-striped progress-bar-animated bg-warning" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
@@ -255,11 +198,9 @@
                                             </div>
                                             <br>
                                         @endif
-
                                         <a href="{{ route('nachrichten.get', [$nach->category->slug, $nach->slug]) }}">
                                             <h2 class="card-title">{{$nach->title}}</h2>
                                         </a>
-
                                         <h6 class="card-subtitle mb-2">
                                             @if ($nach->user and $nach->user->public_author == 1)
                                            <a   class="text-dark" href="{{ route('author.get', [$nach->user->slug]) }}"">
@@ -270,7 +211,6 @@
                                                 <span style="font-weight: normal " class="text-dark"">{{date('d.m.Y H:i', strtotime($nach->created_at))}}</span>
                                             @endif
                                         </h6>
-
                                         @if ($nach->category)
                                             <a href="{{ route('category.get', [$nach->category->slug]) }}">
                                                 <div class="badge badge-primary">
@@ -278,13 +218,10 @@
                                                 </div>
                                             </a>
                                         @endif
-
                                             @if ($nach->image)
                                                 <img src="{{ asset('uploads/' . $nach->image) }}" class="img-responsive" style="max-width: 100%;margin-bottom: 20px; margin-top:20px;    display: block;">
                                             @endif
-
                                     </div>
-
                                     <div class="card-body card-preview-{{ $nach->id }} pay-preview">
                                         <div>
                                             <div class="card-text" id="text_news_{{$nach->id}}">
@@ -292,85 +229,58 @@
                                                 {!! \Str::limit($nach->nachrichten, 285, ' ...') !!}
                                             </div>
                                         </div>
-
                                             @if ($nach->type_id == 2)
                                                 <p class="card-text">
                                                     <p style="font-weight:600;">{{ __('public.work-location') }}</p>
                                                     <div id="text_news_workplace_{{$nach->id}}">{{ isset($nach->additional_fields['workplace']) ? \Str::limit($nach->additional_fields['workplace'], 30, ' ...') : '-'}}
                                                     </div>
                                                         </p>
-
                                                 <p class="card-text">
                                                 <p style="font-weight:600;">{{ __('public.contact-data') }}</p>
                                                 <div id="text_news_contact_info_{{$nach->id}}">{!! isset($nach->additional_fields['contact_info']) ? \Str::limit($nach->additional_fields['contact_info'], 30, ' ...') : '-' !!}
                                                 </div>
                                                 </p>
                                             @endif
-
                                         <div id="box_action_{{ $nach->id }}"></div>
                                     </div>
-
                                     <div class="card-body payment-request" id="payment-request-{{ $nach->id }}">
-
                                         <h2 class="text-center"><i class="far fa-gem fa-2x" style="font-size: 20px;"></i> {{ __('public.premium-content') }}</h2>
-
                                         @if (!empty($nach->premium_until) and $nach->premium_until > date('Y-m-d'))
                                         <small class="text-center d-block">{{ __('public.article-requires-payment') }}mjn  <div id="counter_{{ $nach->id }}" data-id="{{ $nach->id }}" data-date="{{ $nach->premium_until }}" class="counter-class">-</div></small>
                                         @endif
-
                                         <p class="text-center">To read the article
-
                                             @if (!empty($nach->premium_until) and $nach->premium_until > date('Y-m-d'))
                                                 {{ __('public.now') }}now
                                             @endif
                                             {{ __('public.please-pay') }} {{ $nach->paid }} sats</p>
-
                                         <br>
                                         <p class="text-center">
                                             <a href="#ln-invoice-{{ $nach->id }}" data-id="{{ $nach->id }}" class="btn btn-warning get-collapse-invoice"><i class="fas fa-bolt"></i> Pay {{ $nach->paid }} sats</a>
                                             <br>
                                             <a href="" class="howtopay" data-toggle="modal" data-target="#exampleModalCode">{{ __('public.use') }} <i class="fal fa-gem"></i> {{ __('public.premium-pass') }}</a>
-
-                                            @include('template.'.\Setting::get('template', 'default').'.content.includes.explain-lightning')
-
+                                            @include('template.'.config('settings.template').'.content.includes.explain-lightning')
                                             <br>
                                         </p>
-
                                         <div class="row collapse" id="ln-invoice-{{ $nach->id }}">
                                             <div class="col-sm-6 offset-sm-3">
                                                 <a class="pay-news pay-news-{{ $nach->id }}" data-id="{{$nach->id}}" style="cursor:pointer !important;"></a>
-
                                                 <br>
-
                                                 <div id="pay-news-title-{{ $nach->id }}"> </div>
                                             </div>
                                         </div>
-
-
-
-
                                     </div>
-
-
-
                                     @if (env('APP_COMMENTS', false))
                                         <div class="card-footer" id="comment_button_{{$nach->id}}">
-
                                             @if(sizeof($nach->comments) > 0)
-
                                                 <a href="#" onclick="showComments(event, {{$nach->id}})"> <span class="badge badge-primary">{{sizeof($nach->comments)}}</span> {{ __('public.display-comments') }}{{ __('public.see-comments') }}</a>
                                             @else
                                                 <i>{{ __('public.no-comments-yet') }}</i>
                                             @endif
-
                                             <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#exampleModal2" onclick="setCommentId({{$nach->id}}),ga('send', 'event', 'Read Comments', 'Website', '{{$nach->title}}');">
                                                 <i class="fas fa-comment"></i> {{ __('public.comment') }}
                                             </button>
                                         </div>
                                     @endif
-
-
-
                                     <div style="display:none" id="comments_{{$nach->id}}">
                                         <div class="card-footer bg-primary">
                                             <a  class="text-white"> <span class="badge badge-light">{{sizeof($nach->comments)}}</span> {{ __('public.no-comments-yet') }}</a>
@@ -385,7 +295,6 @@
                                                         <i class="fas fa-user" style="color: #007BFF"></i> {{$comment->name}}:
                                                         <!-- For now taking that out, time is wrong... -->
                                                         <span class="float-right" title="{{date('d.m.Y | H:i', strtotime($comment->created_at))}} Uhr">{{date('d.m.Y H:i', strtotime($comment->created_at))}} Uhr</span>
-
                                                     </div>
                                                     <div class="card-body comment-text">
                                                         <p class="card-text">
@@ -396,18 +305,14 @@
                                             @endforeach
                                         </table>
                                     </div>
-
                                 </div>
                             </div>
-
                         @else
                             <div class="col-lg-12">
                                 <div class="card shadow-lg" id="news-{{$nach->id}}">
-
                                     @if(\Session::get('premium_code') and $nach->paid != 0 and (empty($nach->premium_until) or $nach->premium_until > date('Y-m-d')))
                                         <div class="bg-ci text-center top-border-radius" style="font-size: 12px;"><i class="fal fa-gem"></i> Premium content</div>
                                     @endif
-
                                     <div class="card-body">
                                         @if($nach->created_at->diffInHours(date('Y-m-d H:i:s')) < 1)
                                             <div class="progress" style="height: 30px;">
@@ -417,11 +322,9 @@
                                             </div>
                                             <br>
                                         @endif
-
                                         <a href="{{ route('nachrichten.get', [$nach->category->slug, $nach->slug]) }}">
                                             <h2 class="card-title">{{$nach->title}}</h2>
                                         </a>
-
                                         <h6 class="card-subtitle mb-2">
                                             @if ($nach->user and $nach->user->public_author == 1)
                                             <a   class="text-dark" href="{{ route('author.get', [$nach->user->slug]) }}">
@@ -431,7 +334,6 @@
                                                 <span style="font-weight: normal " class="text-dark"">{{date('d.m.Y H:i', strtotime($nach->created_at))}}</span>
                                             @endif
                                         </h6>
-
                                         @if ($nach->category)
                                             <a href="{{ route('category.get', [$nach->category->slug]) }}">
                                                 <div class="badge badge-primary">
@@ -439,104 +341,70 @@
                                                 </div>
                                             </a>
                                         @endif
-
                                         @if ($nach->image)
                                             <img src="{{ asset('uploads/' . $nach->image) }}" class="img-responsive" style="max-width: 100%;margin-bottom: 20px; margin-top:20px;    display: block;">
                                         @endif
-
-
                                         <p class="card-text">
                                             {!! $nach->nachrichten !!}
                                         </p>
-
                                         @if ($nach->type_id == 2)
                                             <p class="card-text">
                                                 <p style="font-weight:600;">{{ __('public.work-location') }}</p> {{ isset($nach->additional_fields['workplace']) ? $nach->additional_fields['workplace'] : '-'}}
                                             </p>
-
                                             <p class="card-text">
                                                 <p style="font-weight:600;">{{ __('public.contact-data') }}</p> {!! isset($nach->additional_fields['contact_info']) ? $nach->additional_fields['contact_info'] : '-' !!}
                                             </p>
                                         @endif
-
                                         @if($nach->type_id == 3)
                                             <hr>
-
                                             <div class="row">
-
                                                     @if($nach->show_total_paid_action == 1)
-
                                                         @if ($nach->actions->count() > 1)
-
                                                         <div class="col-12">
-
                                                             <i class="text-center">{{ __('public.vote-distribution') }}</i>
                                                             <div class="progress">
                                                                 @foreach ($nach->actions as $action)
                                                                     <div class="progress-bar bg-{{ $action->color }}" role="progressbar" style="width: {{ !empty($nach->total_paid_actions()) ? round(($action->payments()->where('status', 1)->sum('amount') * 100) / $nach->total_paid_actions()) : 0 }}%" aria-valuenow="66" aria-valuemin="0" aria-valuemax="100" title="{{ $action->payments()->where('status', 1)->sum('amount') }} sats">{{ !empty($nach->total_paid_actions()) ? round(($action->payments()->where('status', 1)->sum('amount') * 100) / $nach->total_paid_actions()) : 0 }}% </div>
-
                                                                 @endforeach
                                                             </div>
                                                             <br>
-
                                                         </div>
                                                         @endif
                                                     @endif
-
-
-
-
-
-
                                                 @foreach ($nach->actions as $action)
-
                                                     <div class="col">
-
                                                     <small>{{ $action->description }}</small>
                                                         <br>
-
                                                     @if ($action->type == 2)
                                                             <br>
                                                             <textarea class="form-control" id="message_action_{{ $action->id }}" rows="3" placeholder="Write here your message.."></textarea>
                                                     @endif
-
                                                    <!-- @if($nach->show_total_paid_action == 1)
                                                         <br>
-
                                                         @if($action->type == 5)
-
                                                             <i class="text-center">Donation Goal: 10000 sats.</i>
-
                                                             <div class="progress">
                                                                 <div class="progress-bar bg-{{ $action->color }}" role="progressbar"  aria-valuenow="{{ $action->payments()->where('status', 1)->sum('amount') }}" aria-valuemin="0" aria-valuemax="1000">{{ $action->payments()->where('status', 1)->sum('amount') }} sats</div>
                                                             </div>
-
                                                         @else
                                                             <i class="text-center">Total paid: {{ $nach->actions->first()->payments()->where('status', 1)->sum('amount') }} sats</i>
                                                         @endif
-
                                                     @endif-->
-
                                                     </div>
                                                 @endforeach
                                             </div>
-
                                             <div class="row">
                                                 @foreach ($nach->actions as $action)
-
                                                     <div class="col">
                                                         <a href="" style="margin-top: 20px;" id="action{{ $action->id }}" class="btn btn-{{ $action->color }} mx-0 d-block get-action-invoice" data-id="{{ $action->id }}" data-type="{{ $action->type }}" data-execute="0"><i class="fal fa-{{ $action->icon }}"></i> {{ $action->name }} for {{ $action->amount }} sats.</a>
                                                     </div>
                                                 @endforeach
                                             </div>
                                         @endif
-
                                         @if(sizeof($nach->files) > 0)
                                             <br>
                                             <h5>{{ __('public.files-download') }}</h5>
                                             <div class="row">
-
-
                                                 @foreach ($nach->files as $file)
                                                     <div class="col-lg-12">
                                                         <a href="{{ asset($file->url)}}" class="btn btn-primary" onclick="ga('send', 'event', 'File Download', 'User', '{{$file->filename}}');" >
@@ -549,31 +417,19 @@
                                                 @endforeach
                                             </div>
                                         @endif
-
                                     </div>
-
-
-
-
-
                                     @if (env('APP_COMMENTS', false))
                                         <div class="card-footer" id="comment_button_{{$nach->id}}">
-
                                             @if(sizeof($nach->comments) > 0)
-
                                                 <a href="#" onclick="showComments(event, {{$nach->id}})"> <span class="badge badge-primary">{{sizeof($nach->comments)}}</span> {{ __('public.see-comments') }}</a>
                                             @else
                                                 <i>{{ __('public.no-comments-yet') }}</i>
                                             @endif
-
                                             <button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#exampleModal2" onclick="setCommentId({{$nach->id}}),ga('send', 'event', 'Read Comments', 'Website', '{{$nach->title}}');">
                                                 <i class="fas fa-comment"></i> {{ __('public.comment') }}
                                             </button>
                                         </div>
                                     @endif
-
-
-
                                     <div style="display:none" id="comments_{{$nach->id}}">
                                         <div class="card-footer bg-primary">
                                             <a  class="text-white"> <span class="badge badge-light">{{sizeof($nach->comments)}}</span> {{ __('public.comments') }}</a>
@@ -588,7 +444,6 @@
                                                         <i class="fas fa-user" style="color: #007BFF"></i> {{$comment->name}}:
                                                         <!-- For now taking that out, time is wrong... -->
                                                         <span class="float-right" title="{{date('d.m.Y | H:i', strtotime($comment->created_at))}} Uhr">{{date('d.m.Y H:i', strtotime($comment->created_at))}} Uhr</span>
-
                                                     </div>
                                                     <div class="card-body comment-text">
                                                         <p class="card-text">
@@ -599,21 +454,13 @@
                                             @endforeach
                                         </table>
                                     </div>
-
                                 </div>
                             </div>
                         @endif
-
                     </article>
-
                 @endforeach
-
                 {{ $nachrichten->links() }}
             </div>
         </div>
     </section>
-
-
-
-
 @stop
diff --git a/content/dashboard/account.blade.php b/content/dashboard/account.blade.php
index 572fd2a..aa1a3b6 100644
--- a/content/dashboard/account.blade.php
+++ b/content/dashboard/account.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 @section('content')
 
 <div class="admin-header">
diff --git a/content/dashboard/addNachrichten.blade.php b/content/dashboard/addNachrichten.blade.php
index d7a2735..1715c32 100644
--- a/content/dashboard/addNachrichten.blade.php
+++ b/content/dashboard/addNachrichten.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
     <div class="admin-header">
@@ -172,7 +172,7 @@
                                         @endif
                                     </div>
 
-                                    @if (\Setting::get('lnd_status'))
+                                    @if (config('settings.lnd_status'))
                                         <h6 class="ci-color"><i class="fal fa-gem"></i> Define as Premium Content</h6>
 
                                         <div class="form-group" style="margin-bottom: 55px;margin-top:15px;">
diff --git a/content/dashboard/auth/login.blade.php b/content/dashboard/auth/login.blade.php
index 6340646..8bf20e2 100644
--- a/content/dashboard/auth/login.blade.php
+++ b/content/dashboard/auth/login.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/auth/passwords/confirm.blade.php b/content/dashboard/auth/passwords/confirm.blade.php
index 27dfdeb..10e604a 100644
--- a/content/dashboard/auth/passwords/confirm.blade.php
+++ b/content/dashboard/auth/passwords/confirm.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/auth/passwords/email.blade.php b/content/dashboard/auth/passwords/email.blade.php
index f2cc6b0..6ea7846 100644
--- a/content/dashboard/auth/passwords/email.blade.php
+++ b/content/dashboard/auth/passwords/email.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/auth/passwords/reset.blade.php b/content/dashboard/auth/passwords/reset.blade.php
index 3392fc8..f91136a 100644
--- a/content/dashboard/auth/passwords/reset.blade.php
+++ b/content/dashboard/auth/passwords/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/auth/register.blade.php b/content/dashboard/auth/register.blade.php
index 4975460..1032626 100644
--- a/content/dashboard/auth/register.blade.php
+++ b/content/dashboard/auth/register.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/auth/verify.blade.php b/content/dashboard/auth/verify.blade.php
index 608bd00..eef74da 100644
--- a/content/dashboard/auth/verify.blade.php
+++ b/content/dashboard/auth/verify.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 <div class="container">
diff --git a/content/dashboard/editNachrichten.blade.php b/content/dashboard/editNachrichten.blade.php
index c6985a0..7d87626 100644
--- a/content/dashboard/editNachrichten.blade.php
+++ b/content/dashboard/editNachrichten.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 
@@ -154,7 +154,7 @@
                                         </div>
 
 
-                                        @if (\Setting::get('lnd_status'))
+                                        @if (config('settings.lnd_status'))
 
                                             <h6 class="ci-color"><i class="fal fa-gem"></i> Define as Premium Content</h6>
 
diff --git a/content/dashboard/home.blade.php b/content/dashboard/home.blade.php
index d7eba79..0072870 100644
--- a/content/dashboard/home.blade.php
+++ b/content/dashboard/home.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 
 @section('content')
 
diff --git a/content/dashboard/profile.blade.php b/content/dashboard/profile.blade.php
index c7ba072..4fe6084 100644
--- a/content/dashboard/profile.blade.php
+++ b/content/dashboard/profile.blade.php
@@ -1,4 +1,4 @@
-@extends('template.'.\Setting::get('template', 'default').'.content.dashboard.app')
+@extends('template.'.config('settings.template').'.content.dashboard.app')
 @section('content')
 
 <div class="admin-header">
diff --git a/content/includes/integrations.blade.php b/content/includes/integrations.blade.php
index 16e9942..fc3d075 100644
--- a/content/includes/integrations.blade.php
+++ b/content/includes/integrations.blade.php
@@ -1,7 +1,7 @@
 @if(App::environment('production'))
 
 
-    @if (!empty(\Setting::get('facebook', '')))
+    @if (!empty(config('settings.facebook')))
 
 
         <script>
@@ -13,24 +13,24 @@
                 t.src=v;s=b.getElementsByTagName(e)[0];
                 s.parentNode.insertBefore(t,s)}(window, document,'script',
                 'https://connect.facebook.net/en_US/fbevents.js');
-            fbq('init', '{{\Setting::get('facebook') }}');
+            fbq('init', '{{config('settings.facebook') }}');
             fbq('track', 'PageView');
         </script>
         <noscript><img height="1" width="1" style="display:none"
-                       src="https://www.facebook.com/tr?id={{\Setting::get('facebook') }}&ev=PageView&noscript=1"
+                       src="https://www.facebook.com/tr?id={{config('settings.facebook') }}&ev=PageView&noscript=1"
             /></noscript>
 
     @endif
 
-    @if (!empty(\Setting::get('analytics', '')))
+    @if (!empty(config('settings.analytics')))
 
-        <script async src="https://www.googletagmanager.com/gtag/js?id={{\Setting::get('analytics') }}"></script>
+        <script async src="https://www.googletagmanager.com/gtag/js?id={{config('settings.analytics') }}"></script>
         <script>
             window.dataLayer = window.dataLayer || [];
             function gtag(){dataLayer.push(arguments);}
             gtag('js', new Date());
 
-            gtag('config', '{{\Setting::get('analytics') }}');
+            gtag('config', '{{config('settings.analytics') }}');
         </script>
     @endif
 
diff --git a/content/includes/premium-pass-qr.blade.php b/content/includes/premium-pass-qr.blade.php
index 911e531..190dfc1 100644
--- a/content/includes/premium-pass-qr.blade.php
+++ b/content/includes/premium-pass-qr.blade.php
@@ -37,7 +37,7 @@
                             }
                         </style>
 
-                        @if (\Setting::get('stripe_status', 0))
+                        @if (config('settings.stripe_status'))
                             <a class="lnd-pay-card" data-premium-id="">
                                 <small title="Alternative: Pay with Credit Card">
                                     Alternative: Pay with Credit Card
@@ -75,7 +75,7 @@
 
                     <form method="post" id="formStripePremium">
                         <input type="hidden" id="stripe_premium_code_id" name="premium_code_id" value="" />
-                        <input type="hidden" id="amountBtc" name="amount_btc" value="{{ \Setting::get('btc_price', 10000.00) }}" />
+                        <input type="hidden" id="amountBtc" name="amount_btc" value="{{ config('settings.btc_price') }}" />
 
                         <div class="col-12">
                             <div class="row">
diff --git a/content/lists/default.blade.php b/content/lists/default.blade.php
index d9ae0c2..c4ba71d 100644
--- a/content/lists/default.blade.php
+++ b/content/lists/default.blade.php
@@ -74,10 +74,10 @@
         }
     </style>
 
-    @if (\Setting::get('image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image))
+    @if (config('settings.image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image))
         <style>
             .jumbotron-ln {
-                background-image: url({{ asset('uploads/' . \Setting::get('image')) }});
+                background-image: url({{ asset('uploads/' . config('settings.image')) }});
             }
         </style>
     @endif
@@ -97,9 +97,9 @@
             <div class="container brand">
                 <br>
 
-                <a href="{{url('/')}}" >{{ \Setting::get('name')}}</a>
+                <a href="{{url('/')}}" >{{ config('settings.name')}}</a>
                 <br>
-                <span style="font-size: 50%;">{{ \Setting::get('tagline')}}</span>
+                <span style="font-size: 50%;">{{ config('settings.tagline')}}</span>
 
             </div>
 
@@ -110,7 +110,7 @@
 
     @if(\Session::get('premium_code'))
         <div class="bg-ci text-center bg-premium-code" style="font-size: 12px;display:none; cursor: pointer;" title="View your Code and expiration"><i class="fal fa-gem"></i> {{ __('public.premium-active') }}</div>
-        @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-banner')
+        @include('template.'.config('settings.template').'.content.includes.premium-banner')
     @endif
 
     @if (!\Session::get('premium_code'))
@@ -132,7 +132,7 @@
 
                         <div class="modal-body" style="padding-left: 0px; padding-right: 0px;">
 
-                            @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass')
+                            @include('template.'.config('settings.template').'.content.includes.premium-pass')
 
                             <style>
                                 .modal section{
@@ -230,14 +230,14 @@
                         {{ $categoryModel->name }}</h1>
                 @else
                     <br><br>
-                    <h1>{{ \Setting::get('name')}}</h1>
+                    <h1>{{ config('settings.name')}}</h1>
                 @endif
 
                     <p class="intro">
                         @if (isset($categoryModel))
                             {{ $categoryModel->description }}
                         @else
-                            {{ \Setting::get('description')}}
+                            {{ config('settings.description')}}
                         @endif
                         <br>
 
@@ -376,7 +376,7 @@
 
 
 
-            @include('template.'.\Setting::get('template', 'default').'.content.includes.create-content')
+            @include('template.'.config('settings.template').'.content.includes.create-content')
 
 
 
@@ -514,7 +514,7 @@
                                             <br>
                                             <a href="" class="howtopay" data-toggle="modal" data-target="#exampleModalCode">{{ __('public.use') }} <i class="fal fa-gem"></i> {{ __('public.premium-pass') }}</a>
 
-                                            @include('template.'.\Setting::get('template', 'default').'.content.includes.explain-lightning')
+                                            @include('template.'.config('settings.template').'.content.includes.explain-lightning')
 
                                             <br>
                                         </p>
@@ -854,16 +854,16 @@
 
 
 
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.type-iptt')
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.new-comment')
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass-qr')
+    @include('template.'.config('settings.template').'.content.includes.type-iptt')
+    @include('template.'.config('settings.template').'.content.includes.new-comment')
+    @include('template.'.config('settings.template').'.content.includes.premium-pass-qr')
 
     @if(!\Session::get('premium_code'))
         @if (env('PAYMENT', false))
-            @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass')
+            @include('template.'.config('settings.template').'.content.includes.premium-pass')
         @endif
     @else
-        @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-referral')
+        @include('template.'.config('settings.template').'.content.includes.premium-referral')
 
     @endif
 @stop
@@ -982,7 +982,7 @@
 
             $('.btn-sub-stripe').append('<i class="fa fa-spinner fa-spinner-bt fa-spin fa-3x fa-fw" style="font-size:20px;margin-left:10px;"></i>');
 
-            Stripe.setPublishableKey('{{ \Setting::get('stripe_publish_key') }}');
+            Stripe.setPublishableKey('{{ config('settings.stripe_publish_key') }}');
 
             var valid = $('[name="card_valid"]').val();
             var valid = valid.split('-');
diff --git a/content/news.blade.php b/content/news.blade.php
index 03e4c85..0e94c3c 100644
--- a/content/news.blade.php
+++ b/content/news.blade.php
@@ -74,10 +74,10 @@
         }
     </style>
 
-    @if (\Setting::get('image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image))
+    @if (config('settings.image') and !isset($categoryModel) or (isset($categoryModel) and !$categoryModel->image))
         <style>
             .jumbotron-ln {
-                background-image: url({{ asset('uploads/' . \Setting::get('image')) }});
+                background-image: url({{ asset('uploads/' . config('settings.image')) }});
             }
         </style>
     @endif
@@ -97,9 +97,9 @@
             <div class="container brand">
                 <br>
 
-                <a href="{{url('/')}}" >{{ \Setting::get('name')}}</a>
+                <a href="{{url('/')}}" >{{ config('settings.name')}}</a>
                 <br>
-                <span style="font-size: 50%;">{{ \Setting::get('tagline')}}</span>
+                <span style="font-size: 50%;">{{ config('settings.tagline')}}</span>
 
             </div>
 
@@ -110,7 +110,7 @@
 
     @if(\Session::get('premium_code'))
         <div class="bg-ci text-center bg-premium-code" style="font-size: 12px;display:none; cursor: pointer;" title="View your Code and expiration"><i class="fal fa-gem"></i> {{ __('public.premium-active') }}</div>
-        @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-banner')
+        @include('template.'.config('settings.template').'.content.includes.premium-banner')
     @endif
 
     @if (!\Session::get('premium_code'))
@@ -132,7 +132,7 @@
 
                         <div class="modal-body" style="padding-left: 0px; padding-right: 0px;">
 
-                            @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass')
+                            @include('template.'.config('settings.template').'.content.includes.premium-pass')
 
                             <style>
                                 .modal section{
@@ -230,14 +230,14 @@
                         {{ $categoryModel->name }}</h1>
                 @else
                     <br><br>
-                    <h1>{{ \Setting::get('name')}}</h1>
+                    <h1>{{ config('settings.name')}}</h1>
                 @endif
 
                     <p class="intro">
                         @if (isset($categoryModel))
                             {{ $categoryModel->description }}
                         @else
-                            {{ \Setting::get('description')}}
+                            {{ config('settings.description')}}
                         @endif
                         <br>
 
@@ -376,7 +376,7 @@
 
 
 
-            @include('template.'.\Setting::get('template', 'default').'.content.includes.create-content')
+            @include('template.'.config('settings.template').'.content.includes.create-content')
 
 
 
@@ -512,7 +512,7 @@
                                             <br>
                                             <a href="" class="howtopay" data-toggle="modal" data-target="#exampleModalCode">{{ __('public.use') }} <i class="fal fa-gem"></i> {{ __('public.premium-pass') }}</a>
 
-                                            @include('template.'.\Setting::get('template', 'default').'.content.includes.explain-lightning')
+                                            @include('template.'.config('settings.template').'.content.includes.explain-lightning')
 
                                             <br>
                                         </p>
@@ -848,16 +848,16 @@
 
 
 
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.type-iptt')
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.new-comment')
-    @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass-qr')
+    @include('template.'.config('settings.template').'.content.includes.type-iptt')
+    @include('template.'.config('settings.template').'.content.includes.new-comment')
+    @include('template.'.config('settings.template').'.content.includes.premium-pass-qr')
 
     @if(!\Session::get('premium_code'))
         @if (env('PAYMENT', false))
-            @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-pass')
+            @include('template.'.config('settings.template').'.content.includes.premium-pass')
         @endif
     @else
-        @include('template.'.\Setting::get('template', 'default').'.content.includes.premium-referral')
+        @include('template.'.config('settings.template').'.content.includes.premium-referral')
 
     @endif
 @stop
@@ -976,7 +976,7 @@
 
             $('.btn-sub-stripe').append('<i class="fa fa-spinner fa-spinner-bt fa-spin fa-3x fa-fw" style="font-size:20px;margin-left:10px;"></i>');
 
-            Stripe.setPublishableKey('{{ \Setting::get('stripe_publish_key') }}');
+            Stripe.setPublishableKey('{{ config('settings.stripe_publish_key') }}');
 
             var valid = $('[name="card_valid"]').val();
             var valid = valid.split('-');