diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 2c2d6487bc2c..67b0e3cc2cb1 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -126,15 +126,13 @@ class CompanySettings extends BaseSettings
     public $auto_bill = 'off'; //off,always,optin,optout //@implemented
     public $auto_bill_date = 'on_due_date'; // on_due_date , on_send_date //@implemented
 
-    //public $design = 'views/pdf/design1.blade.php'; //@deprecated - never used
-
     public $invoice_terms = ''; //@implemented
     public $quote_terms = ''; //@implemented
     public $invoice_taxes = 0; // ? used in AP only?
-    // public $enabled_item_tax_rates = 0;
-    public $invoice_design_id = 'VolejRejNm'; //@implemented
-    public $quote_design_id = 'VolejRejNm'; //@implemented
-    public $credit_design_id = 'VolejRejNm'; //@implemented
+
+    public $invoice_design_id = 'Wpmbk5ezJn'; //@implemented
+    public $quote_design_id = 'Wpmbk5ezJn'; //@implemented
+    public $credit_design_id = 'Wpmbk5ezJn'; //@implemented
     public $invoice_footer = ''; //@implemented
     public $credit_footer = ''; //@implemented
     public $credit_terms = ''; //@implemented
@@ -146,7 +144,6 @@ class CompanySettings extends BaseSettings
     public $tax_name3 = ''; //@TODO where do we use this?
     public $tax_rate3 = 0; //@TODO where do we use this?
     public $payment_type_id = '0'; //@TODO where do we use this?
-    // public $invoice_fields = ''; //@TODO is this redundant, we store this in the custom_fields on the company?
 
     public $valid_until = ''; //@implemented
 
diff --git a/app/Http/Controllers/OpenAPI/RecurringExpense.php b/app/Http/Controllers/OpenAPI/RecurringExpense.php
new file mode 100644
index 000000000000..0f2c606b7cc0
--- /dev/null
+++ b/app/Http/Controllers/OpenAPI/RecurringExpense.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @OA\Schema(
+ *   schema="RecurringExpense",
+ *   type="object",
+ *       @OA\Property(property="id", type="string", example="Opnel5aKBz", description="_________"),
+ *       @OA\Property(property="user_id", type="string", example="", description="__________"),
+ *       @OA\Property(property="assigned_user_id", type="string", example="", description="__________"),
+ *       @OA\Property(property="company_id", type="string", example="", description="________"),
+ *       @OA\Property(property="client_id", type="string", example="", description="________"),
+ *       @OA\Property(property="invoice_id", type="string", example="", description="________"),
+ *       @OA\Property(property="bank_id", type="string", example="", description="________"),
+ *       @OA\Property(property="invoice_currency_id", type="string", example="", description="________"),
+ *       @OA\Property(property="expense_currency_id", type="string", example="", description="________"),
+ *       @OA\Property(property="invoice_category_id", type="string", example="", description="________"),
+ *       @OA\Property(property="payment_type_id", type="string", example="", description="________"),
+ *       @OA\Property(property="recurring_expense_id", type="string", example="", description="________"),
+ *       @OA\Property(property="private_notes", type="string", example="", description="________"),
+ *       @OA\Property(property="public_notes", type="string", example="", description="________"),
+ *       @OA\Property(property="transaction_reference", type="string", example="", description="________"),
+ *       @OA\Property(property="transcation_id", type="string", example="", description="________"),
+ *       @OA\Property(property="custom_value1", type="string", example="", description="________"),
+ *       @OA\Property(property="custom_value2", type="string", example="", description="________"),
+ *       @OA\Property(property="custom_value3", type="string", example="", description="________"),
+ *       @OA\Property(property="custom_value4", type="string", example="", description="________"),
+ *       @OA\Property(property="tax_name1", type="string", example="", description="________"),
+ *       @OA\Property(property="tax_name2", type="string", example="", description="________"),
+ *       @OA\Property(property="tax_rate1", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="tax_rate2", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="tax_name3", type="string", example="", description="________"),
+ *       @OA\Property(property="tax_rate3", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="amount", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="frequency_id", type="number", format="int", example="1", description="_________"),
+ *       @OA\Property(property="remaining_cycles", type="number", format="int", example="1", description="_________"),
+ *       @OA\Property(property="foreign_amount", type="number", format="float", example="10.00", description="_________"),
+ *       @OA\Property(property="exchange_rate", type="number", format="float", example="0.80", description="_________"),
+ *       @OA\Property(property="date", type="string", example="", description="________"),
+ *       @OA\Property(property="payment_date", type="string", example="", description="________"),
+ *       @OA\Property(property="should_be_invoiced", type="boolean", example=true, description="_________"),
+ *       @OA\Property(property="is_deleted", type="boolean", example=true, description="_________"),
+ *       @OA\Property(property="last_sent_date", type="string", format="date", example="1994-07-30", description="The Date it was sent last"),
+ *       @OA\Property(property="next_send_date", type="string", format="date", example="1994-07-30", description="The next send date"),
+ *       @OA\Property(property="invoice_documents", type="boolean", example=true, description=""),
+ *       @OA\Property(property="updated_at", type="number", format="integer", example="1434342123", description="Timestamp"),
+ *       @OA\Property(property="archived_at", type="number", format="integer", example="1434342123", description="Timestamp"),
+ * )
+ */
\ No newline at end of file
diff --git a/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
new file mode 100644
index 000000000000..736370b7692a
--- /dev/null
+++ b/app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\Requests\GroupSetting;
+
+use App\Http\Requests\Request;
+
+class UploadGroupSettingRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() : bool
+    {
+        return auth()->user()->can('edit', $this->group_setting);
+    }
+
+    public function rules()
+    {
+
+    	$rules = [];
+
+		if($this->input('documents'))
+            $rules['documents'] = 'file|mimes:html,csv,png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:2000000';
+
+    	return $rules;
+
+    }
+}