diff --git a/app/Http/Middleware/ContactRegister.php b/app/Http/Middleware/ContactRegister.php
index b2cf964b87a2..60e48d8771c0 100644
--- a/app/Http/Middleware/ContactRegister.php
+++ b/app/Http/Middleware/ContactRegister.php
@@ -21,6 +21,7 @@ class ContactRegister
     {
         $domain_name = $request->getHost();
 
+        /* Hosted */
         if (strpos($domain_name, 'invoicing.co') !== false) {
             $subdomain = explode('.', $domain_name)[0];
 
@@ -42,6 +43,7 @@ class ContactRegister
             }
         }
 
+        /* Hosted */
         if (Ninja::isHosted()) {
             $query = [
                 'portal_domain' => $request->getSchemeAndHttpHost(),
diff --git a/app/Services/Invoice/MarkInvoiceDeleted.php b/app/Services/Invoice/MarkInvoiceDeleted.php
index 8990cbfaa597..b7478f920133 100644
--- a/app/Services/Invoice/MarkInvoiceDeleted.php
+++ b/app/Services/Invoice/MarkInvoiceDeleted.php
@@ -45,8 +45,7 @@ class MarkInvoiceDeleted extends AbstractService
              ->setAdjustmentAmount()
              ->deletePaymentables()
              ->adjustPayments()
-             ->adjustPaidToDate()
-             ->adjustBalance()
+             ->adjustPaidToDateAndBalance()
              ->adjustLedger();
 
         $transaction = [
@@ -70,21 +69,29 @@ class MarkInvoiceDeleted extends AbstractService
         return $this;
     }
 
-    private function adjustPaidToDate()
+    private function adjustPaidToDateAndBalance()
     {
-        $client = $this->invoice->client->fresh();
-        $client->paid_to_date += $this->adjustment_amount * -1;
-        $client->save();
-        // $this->invoice->client->service()->updatePaidToDate($this->adjustment_amount * -1)->save(); //reduces the paid to date by the payment totals
+        // $client = $this->invoice->client->fresh();
+        // $client->paid_to_date += $this->adjustment_amount * -1;
+        // $client->balance += $this->balance_adjustment * -1;
+        // $client->save();
+
+        // 06-09-2022
+        $this->invoice
+             ->client
+             ->service()
+             ->updateBalanceAndPaidToDate($this->balance_adjustment * -1, $this->adjustment_amount * -1)
+             ->save(); //reduces the paid to date by the payment totals
 
         return $this;
     }
 
+    // @deprecated
     private function adjustBalance()
     {
-        $client = $this->invoice->client->fresh();
-        $client->balance += $this->balance_adjustment * -1;
-        $client->save();
+        // $client = $this->invoice->client->fresh();
+        // $client->balance += $this->balance_adjustment * -1;
+        // $client->save();
 
         // $this->invoice->client->service()->updateBalance($this->balance_adjustment * -1)->save(); //reduces the client balance by the invoice amount.
 
diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php
index 2c545556c05e..9f734d17d802 100644
--- a/app/Services/Invoice/MarkPaid.php
+++ b/app/Services/Invoice/MarkPaid.php
@@ -117,16 +117,12 @@ class MarkPaid extends AbstractService
         $payment->ledger()
                 ->updatePaymentBalance($this->payable_balance * -1);
 
-        // \DB::connection(config('database.default'))->transaction(function () use ($payment) {
-
-        // /* Get the last record for the client and set the current balance*/
-        //     $client = Client::withTrashed()->where('id', $this->invoice->client_id)->lockForUpdate()->first();
-        //     $client->paid_to_date += $payment->amount;
-        //     $client->balance -= $payment->amount;
-        //     $client->save();
-        // }, 1);
-
-                $this->invoice->client->service()->updateBalanceAndPaidToDate($payment->amount*-1, $payment->amount)->save();
+        //06-09-2022
+        $this->invoice
+             ->client
+             ->service()
+             ->updateBalanceAndPaidToDate($payment->amount*-1, $payment->amount)
+             ->save();
 
         $this->invoice = $this->invoice
                              ->service()
diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php
index fae67eb6540c..07bae6f98659 100644
--- a/app/Services/Invoice/MarkSent.php
+++ b/app/Services/Invoice/MarkSent.php
@@ -62,16 +62,6 @@ class MarkSent extends AbstractService
              ->save();
 
         /*Adjust client balance*/
-
-        // \DB::connection(config('database.default'))->transaction(function () use ($adjustment) {
-
-        // /* Get the last record for the client and set the current balance*/
-        //     $client = Client::withTrashed()->where('id', $this->client->id)->lockForUpdate()->first();
-        //     $client->balance += $adjustment;
-        //     $client->save();
-            
-        // }, 1);
-        
         $this->invoice->client->service()->updateBalance($adjustment)->save();
 
         $this->invoice->markInvitationsSent();
diff --git a/app/Utils/Traits/Payment/Refundable.php b/app/Utils/Traits/Payment/Refundable.php
index c313e1b782a3..7bcbabb98a91 100644
--- a/app/Utils/Traits/Payment/Refundable.php
+++ b/app/Utils/Traits/Payment/Refundable.php
@@ -28,6 +28,7 @@ trait Refundable
     /**
      * Entry point for processing of refunds.
      * @param array $data
+     * @deprecated ???? 06-09-2022
      * @return Refundable
      * @throws PaymentRefundFailed
      */
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 9a8f13540cef..30b94a07629d 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -52,7 +52,7 @@
                                 @elseif($field['key'] === 'country_id')
                                     <select 
                                         id="shipping_country"
-                                        class="input w-full form-select"
+                                        class="input w-full form-select bg-white"
                                         name="country_id">
                                             <option value="none"></option>
                                         @foreach(App\Utils\TranslationHelper::getCountries() as $country)
diff --git a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
index 032ec9a4e379..04395c512ef7 100644
--- a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
@@ -15,7 +15,7 @@
                 @if(!array_key_exists('filled', $field))
                     @component('portal.ninja2020.components.general.card-element', ['title' => $field['label']])
                         @if($field['name'] == 'client_country_id' || $field['name'] == 'client_shipping_country_id')
-                            <select id="client_country" class="input w-full form-select" name="{{ $field['name'] }}" wire:model.lazy="{{ str_replace(["client_","_line_","contact_"], ["client.","","contact."], $field['name']) }}">
+                            <select id="client_country" class="input w-full form-select bg-white" name="{{ $field['name'] }}" wire:model.lazy="{{ str_replace(["client_","_line_","contact_"], ["client.","","contact."], $field['name']) }}">
                                 <option value="none"></option>
 
                                 @foreach($countries as $country)
diff --git a/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
index 6929c8b3ea8b..318d2d94391e 100644
--- a/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
@@ -55,7 +55,7 @@
         @endcomponent
 
         @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
-            <select name="countries" id="country" name="country" class="form-select input w-full" required>
+            <select name="countries" id="country" name="country" class="form-select input w-full bg-white" required>
                 @foreach($countries as $country)
                     <option value="{{ $country->iso_3166_2 }}" {{$country->iso_3166_2 == 'US' ? "selected" : ""}}>{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
                 @endforeach
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
index d88aeb847fa8..46f4e5443766 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
@@ -47,7 +47,7 @@
     @endcomponent
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
-        <select name="countries" id="country" class="form-select input w-full">
+        <select name="countries" id="country" class="form-select input w-full bg-white">
             <option disabled selected></option>
             @foreach($countries as $country)
                 @if($country->iso_3166_2 == 'US')
diff --git a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
index 0a5f0173e910..1537ee4c6e01 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
@@ -45,7 +45,7 @@
     @endcomponent
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
-        <select name="countries" id="country" class="form-select input w-full" required>
+        <select name="countries" id="country" class="form-select input w-full bg-white" required>
             @foreach($countries as $country)
                 <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
             @endforeach
diff --git a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
index 0a5f0173e910..1537ee4c6e01 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
@@ -45,7 +45,7 @@
     @endcomponent
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
-        <select name="countries" id="country" class="form-select input w-full" required>
+        <select name="countries" id="country" class="form-select input w-full bg-white" required>
             @foreach($countries as $country)
                 <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
             @endforeach
diff --git a/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
index 0a5f0173e910..1537ee4c6e01 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/sepa/authorize.blade.php
@@ -45,7 +45,7 @@
     @endcomponent
 
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
-        <select name="countries" id="country" class="form-select input w-full" required>
+        <select name="countries" id="country" class="form-select input w-full bg-white" required>
             @foreach($countries as $country)
                 <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
             @endforeach
diff --git a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
index e4b9ffc6e4fd..b971bbad9b1d 100644
--- a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
+++ b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
@@ -57,7 +57,7 @@
                         </div>
                         <div class="col-span-6 sm:col-span-2">
                             <label for="country" class="input-label">@lang('texts.country')</label>
-                            <select id="country" class="input w-full form-select {{ in_array('billing_country', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" wire:model.defer="country_id">
+                            <select id="country" class="input w-full form-select bg-white {{ in_array('billing_country', (array) session('missing_required_fields')) ? 'border border-red-400' : '' }}" wire:model.defer="country_id">
                                 <option value="none"></option>
                                 @foreach($countries as $country)
                                     <option value="{{ $country->id }}">
diff --git a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
index 82d15ebfde69..86a3accfe74d 100644
--- a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
+++ b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
@@ -58,7 +58,7 @@
                             </div>
                             <div class="col-span-4 sm:col-span-2">
                                 <label for="shipping_country" class="input-label">@lang('texts.shipping_country')</label>
-                                <select id="shipping_country" class="input w-full form-select" wire:model.defer="shipping_country_id">
+                                <select id="shipping_country" class="input w-full form-select bg-white" wire:model.defer="shipping_country_id">
                                     <option value="none"></option>
                                     @foreach($countries as $country)
                                     <option value="{{ $country->id }}">