From 4349b8fc0359ca5b2aed22ce23e330acfd030e98 Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Thu, 11 Aug 2022 08:54:24 +0100
Subject: [PATCH] #150: Use standard file headers everywhere.

* Add default header in IDETemplateMacros.plist.
* Use the standard header everywhere.
---
 .../Buttons/ElementActionButtonStyle.swift    |  2 +-
 .../Buttons/ElementGhostButtonStyle.swift     |  2 +-
 .../Sources/Common/ElementControlSize.swift   |  2 +-
 DesignKit/Sources/Fonts/ElementFonts.swift    |  2 +-
 .../Sources/Fonts/ElementSharedFonts.swift    |  2 +-
 DesignKit/Sources/Fonts/ElementUIFonts.swift  |  2 +-
 DesignKit/Sources/Fonts/Fonts.swift           |  2 +-
 DesignKit/Sources/Fonts/UIFont.swift          |  2 +-
 .../Sources/Shapes/RoundedCornerShape.swift   |  2 +-
 .../TextFields/BorderedInputFieldStyle.swift  |  2 +-
 .../TextFields/ElementTextFieldStyle.swift    |  2 +-
 .../xcshareddata/IDETemplateMacros.plist      | 22 +++++++++++++++++++
 ElementX/Sources/AppCoordinator.swift         | 16 ++++++++++----
 .../Sources/AppCoordinatorStateMachine.swift  | 16 ++++++++++----
 ElementX/Sources/AppDelegate.swift            | 16 ++++++++++----
 ElementX/Sources/BuildSettings.swift          | 16 ++++++++++----
 ElementX/Sources/Other/Benchmark.swift        | 16 ++++++++++----
 .../Other/ElementNavigationController.swift   | 16 ++++++++++----
 ElementX/Sources/Other/ElementSettings.swift  | 16 ++++++++++----
 .../Sources/Other/Extensions/Bundle.swift     | 16 ++++++++++----
 .../Sources/Other/Extensions/String.swift     |  2 +-
 .../HTMLParsing/AttributedStringBuilder.swift | 16 ++++++++++----
 .../AttributedStringBuilderProtocol.swift     | 16 ++++++++++----
 ...THTMLElement+AttributedStringBuilder.swift | 16 ++++++++++----
 .../HTMLParsing/ElementXAttributeScope.swift  | 16 ++++++++++----
 .../UIFont+AttributedStringBuilder.h          | 16 ++++++++++----
 .../UIFont+AttributedStringBuilder.m          | 16 ++++++++++----
 ElementX/Sources/Other/ImageAnonymizer.swift  | 16 ++++++++++----
 .../Sources/Other/MatrixEntityRegex.swift     | 16 ++++++++++----
 .../Other/Routers/NavigationModule.swift      |  2 +-
 .../Other/Routers/NavigationRouterStore.swift |  2 +-
 .../NavigationRouterStoreProtocol.swift       |  2 +-
 .../SwiftUI/ErrorHandling/AlertInfo.swift     |  2 +-
 .../SwiftUI/Layout/FramePreferenceKey.swift   |  2 +-
 .../SwiftUI/Layout/ViewFrameReader.swift      |  2 +-
 .../SwiftUI/ViewModel/BindableState.swift     |  2 +-
 .../ViewModel/StateStoreViewModel.swift       |  2 +-
 .../SwiftUI/Views/ElementToggleStyle.swift    | 16 ++++++++++----
 .../FullscreenLoadingViewPresenter.swift      |  2 +-
 .../LabelledActivityIndicatorView.swift       |  2 +-
 .../UserIndicators/RectangleToastView.swift   |  2 +-
 .../UserIndicators/RoundedToastView.swift     |  2 +-
 .../UserIndicators/ToastViewPresenter.swift   |  2 +-
 .../Other/UserIndicators/ToastViewState.swift |  2 +-
 .../Other/UserIndicators/UserIndicator.swift  |  2 +-
 .../UserIndicatorDismissal.swift              |  2 +-
 .../UserIndicatorPresenter.swift              |  2 +-
 .../UserIndicators/UserIndicatorQueue.swift   |  2 +-
 .../UserIndicators/UserIndicatorRequest.swift |  2 +-
 .../UserIndicatorViewPresentable.swift        |  2 +-
 .../AuthenticationCoordinator.swift           | 16 ++++++++++----
 .../LoginScreen/LoginCoordinator.swift        |  2 +-
 .../LoginScreen/LoginModels.swift             |  2 +-
 .../LoginScreen/LoginViewModel.swift          |  2 +-
 .../LoginScreen/LoginViewModelProtocol.swift  |  2 +-
 .../LoginScreen/View/LoginScreen.swift        |  2 +-
 .../MockServerSelectionScreenState.swift      |  2 +-
 .../ServerSelectionCoordinator.swift          |  2 +-
 .../ServerSelectionModels.swift               |  2 +-
 .../ServerSelectionViewModel.swift            |  2 +-
 .../ServerSelectionViewModelProtocol.swift    |  2 +-
 .../View/ServerSelectionScreen.swift          |  2 +-
 .../Screens/Authentication/UIConstants.swift  |  2 +-
 .../BugReport/BugReportCoordinator.swift      |  2 +-
 .../Screens/BugReport/BugReportModels.swift   |  2 +-
 .../BugReport/BugReportViewModel.swift        |  2 +-
 .../BugReportViewModelProtocol.swift          |  2 +-
 .../BugReport/View/BugReportScreen.swift      |  2 +-
 .../HomeScreen/HomeScreenCoordinator.swift    |  2 +-
 .../Screens/HomeScreen/HomeScreenModels.swift |  2 +-
 .../HomeScreen/HomeScreenViewModel.swift      |  2 +-
 .../HomeScreenViewModelProtocol.swift         |  2 +-
 .../Screens/HomeScreen/View/HomeScreen.swift  |  2 +-
 .../RoomScreen/RoomScreenCoordinator.swift    |  2 +-
 .../Screens/RoomScreen/RoomScreenModels.swift |  2 +-
 .../RoomScreen/RoomScreenViewModel.swift      |  2 +-
 .../RoomScreenViewModelProtocol.swift         |  2 +-
 .../View/ListTableViewAdapter.swift           | 16 ++++++++++----
 .../RoomScreen/View/MessageComposer.swift     | 16 ++++++++++----
 .../View/MessageComposerTextField.swift       | 16 ++++++++++----
 .../RoomScreen/View/RoomHeaderView.swift      | 16 ++++++++++----
 .../Screens/RoomScreen/View/RoomScreen.swift  |  2 +-
 .../Style/TimelineItemBubbledStylerView.swift | 16 ++++++++++----
 .../Style/TimelineItemPlainStylerView.swift   | 16 ++++++++++----
 .../RoomScreen/View/Style/TimelineStyle.swift | 16 ++++++++++----
 .../View/Style/TimelineStyler.swift           | 16 ++++++++++----
 .../View/Timeline/EmoteRoomTimelineView.swift | 16 ++++++++++----
 .../View/Timeline/FormattedBodyText.swift     | 16 ++++++++++----
 .../View/Timeline/ImageRoomTimelineView.swift | 16 ++++++++++----
 .../Timeline/NoticeRoomTimelineView.swift     | 16 ++++++++++----
 .../Timeline/SeparatorRoomTimelineView.swift  | 16 ++++++++++----
 .../View/Timeline/TextRoomTimelineView.swift  | 16 ++++++++++----
 .../View/TimelineItemContextMenu.swift        | 16 ++++++++++----
 .../RoomScreen/View/TimelineItemList.swift    | 16 ++++++++++----
 .../View/TimelineSenderAvatarView.swift       | 16 ++++++++++----
 .../RoomScreen/View/TimelineView.swift        | 16 ++++++++++----
 .../SessionVerificationCoordinator.swift      |  2 +-
 .../SessionVerificationModels.swift           |  2 +-
 .../SessionVerificationStateMachine.swift     | 16 ++++++++++----
 .../SessionVerificationViewModel.swift        |  2 +-
 ...SessionVerificationViewModelProtocol.swift |  2 +-
 .../View/SessionVerificationScreen.swift      |  2 +-
 .../Settings/SettingsCoordinator.swift        |  2 +-
 .../Screens/Settings/SettingsModels.swift     |  2 +-
 .../Screens/Settings/SettingsViewModel.swift  |  2 +-
 .../Settings/SettingsViewModelProtocol.swift  |  2 +-
 .../Settings/View/SettingsScreen.swift        |  2 +-
 .../Screens/Splash/SplashViewController.swift | 16 ++++++++++----
 .../SplashScreenCoordinator.swift             |  2 +-
 .../SplashScreen/SplashScreenModels.swift     |  2 +-
 .../SplashScreen/SplashScreenViewModel.swift  |  2 +-
 .../SplashScreenViewModelProtocol.swift       |  2 +-
 .../SplashScreen/View/SplashScreen.swift      |  2 +-
 .../View/SplashScreenPageIndicator.swift      |  2 +-
 .../View/SplashScreenPageView.swift           |  2 +-
 .../AuthenticationServiceProxy.swift          | 16 ++++++++++----
 .../AuthenticationServiceProxyProtocol.swift  | 16 ++++++++++----
 .../MockAuthenticationServiceProxy.swift      | 16 ++++++++++----
 .../Services/Authentication/OIDCService.swift | 16 ++++++++++----
 .../Background/ApplicationProtocol.swift      | 16 ++++++++++----
 .../Background/BackgroundTaskProtocol.swift   | 16 ++++++++++----
 .../BackgroundTaskServiceProtocol.swift       | 16 ++++++++++----
 .../Background/UIKitBackgroundTask.swift      | 16 ++++++++++----
 .../UIKitBackgroundTaskService.swift          | 16 ++++++++++----
 .../Services/BugReport/BugReportService.swift | 16 ++++++++++----
 .../BugReport/BugReportServiceProtocol.swift  | 16 ++++++++++----
 .../BugReport/MockBugReportService.swift      | 16 ++++++++++----
 .../BugReport/ScreenshotDetector.swift        | 16 ++++++++++----
 .../Sources/Services/Client/ClientError.swift | 16 ++++++++++----
 .../Sources/Services/Client/ClientProxy.swift | 16 ++++++++++----
 .../Services/Client/ClientProxyProtocol.swift | 16 ++++++++++----
 .../Services/Client/MockClientProxy.swift     | 16 ++++++++++----
 .../Services/Media/MediaProvider.swift        | 16 ++++++++++----
 .../Media/MediaProviderProtocol.swift         | 16 ++++++++++----
 .../Sources/Services/Media/MediaSource.swift  | 16 ++++++++++----
 .../Services/Media/MockMediaProvider.swift    | 16 ++++++++++----
 .../Members/MemberDetailProviderManager.swift | 16 ++++++++++----
 .../Room/Members/MemberDetailsProvider.swift  | 16 ++++++++++----
 .../MemberDetailsProviderProtocol.swift       | 16 ++++++++++----
 .../Room/Messages/EmoteRoomMessage.swift      | 16 ++++++++++----
 .../Room/Messages/ImageRoomMessage.swift      | 16 ++++++++++----
 .../Room/Messages/NoticeRoomMessage.swift     | 16 ++++++++++----
 .../Room/Messages/RoomMessageProtocol.swift   | 16 ++++++++++----
 .../Room/Messages/TextRoomMessage.swift       | 16 ++++++++++----
 .../Sources/Services/Room/MockRoomProxy.swift | 16 ++++++++++----
 .../Services/Room/RoomMessageFactory.swift    | 16 ++++++++++----
 .../Room/RoomMessageFactoryProtocol.swift     | 16 ++++++++++----
 .../Sources/Services/Room/RoomProxy.swift     | 16 ++++++++++----
 .../Services/Room/RoomProxyProtocol.swift     | 16 ++++++++++----
 .../Room/RoomSummary/EventBrief.swift         | 16 ++++++++++----
 .../Room/RoomSummary/EventBriefFactory.swift  | 16 ++++++++++----
 .../EventBriefFactoryProtocol.swift           | 16 ++++++++++----
 .../Room/RoomSummary/MockRoomSummary.swift    | 16 ++++++++++----
 .../Room/RoomSummary/RoomSummary.swift        | 16 ++++++++++----
 .../RoomSummary/RoomSummaryProtocol.swift     | 16 ++++++++++----
 .../Services/Session/MockUserSession.swift    | 16 ++++++++++----
 .../Services/Session/UserSession.swift        | 16 ++++++++++----
 .../Session/UserSessionProtocol.swift         | 16 ++++++++++----
 ...ckSessionVerificationControllerProxy.swift | 16 ++++++++++----
 .../SessionVerificationControllerProxy.swift  | 16 ++++++++++----
 ...nVerificationControllerProxyProtocol.swift | 16 ++++++++++----
 .../Timeline/MockRoomTimelineController.swift | 16 ++++++++++----
 .../Timeline/RoomTimelineController.swift     | 16 ++++++++++----
 .../RoomTimelineControllerProtocol.swift      | 16 ++++++++++----
 .../Timeline/RoomTimelineProvider.swift       | 16 ++++++++++----
 .../RoomTimelineProviderProtocol.swift        | 16 ++++++++++----
 .../DecorationTimelineItemProtocol.swift      | 16 ++++++++++----
 .../EventBasedTimelineItemProtocol.swift      | 16 ++++++++++----
 .../Items/EmoteRoomTimelineItem.swift         | 16 ++++++++++----
 .../Items/ImageRoomTimelineItem.swift         | 16 ++++++++++----
 .../Items/NoticeRoomTimelineItem.swift        | 16 ++++++++++----
 .../Items/SeparatorRoomTimelineItem.swift     | 16 ++++++++++----
 .../Items/TextRoomTimelineItem.swift          | 16 ++++++++++----
 .../RoomTimelineItemFactory.swift             | 16 ++++++++++----
 .../RoomTimelineItemFactoryProtocol.swift     | 16 ++++++++++----
 .../RoomTimelineItemProtocol.swift            | 16 ++++++++++----
 .../RoomTimelineViewFactory.swift             | 16 ++++++++++----
 .../RoomTimelineViewFactoryProtocol.swift     | 16 ++++++++++----
 .../RoomTimelineViewProvider.swift            | 16 ++++++++++----
 .../UserSessionStore/FileManager.swift        | 16 ++++++++++----
 .../UserSessionStore/KeychainController.swift | 16 ++++++++++----
 .../KeychainControllerProtocol.swift          | 16 ++++++++++----
 ElementX/Sources/UITestScreenIdentifier.swift | 16 ++++++++++----
 ElementX/Sources/UITestsAppCoordinator.swift  | 16 ++++++++++----
 ElementX/Sources/UITestsRootView.swift        | 16 ++++++++++----
 .../ElementX/TemplateCoordinator.swift        |  2 +-
 .../ElementX/TemplateModels.swift             |  2 +-
 .../ElementX/TemplateViewModel.swift          |  2 +-
 .../ElementX/TemplateViewModelProtocol.swift  |  2 +-
 .../ElementX/View/TemplateScreen.swift        |  2 +-
 .../Tests/UI/TemplateScreenUITests.swift      |  2 +-
 .../Tests/Unit/TemplateViewModelTests.swift   |  2 +-
 Tools/XcodeGen/IDETemplateMacros.plist        | 22 +++++++++++++++++++
 Tools/XcodeGen/postGenCommand.sh              |  6 +++++
 UITests/Sources/Application.swift             | 16 ++++++++++----
 .../AuthenticationCoordinatorUITests.swift    | 16 ++++++++++----
 UITests/Sources/BugReportUITests.swift        |  2 +-
 UITests/Sources/HomeScreenUITests.swift       |  2 +-
 UITests/Sources/LoginScreenUITests.swift      |  2 +-
 UITests/Sources/RoomScreenUITests.swift       |  2 +-
 UITests/Sources/ServerSelectionUITests.swift  |  2 +-
 .../Sources/SessionVerificationUITests.swift  |  2 +-
 UITests/Sources/SettingsUITests.swift         |  2 +-
 UITests/Sources/SplashScreenUITests.swift     |  2 +-
 .../AttributedStringBuilderTests.swift        | 16 ++++++++++----
 UnitTests/Sources/BackgroundTaskTests.swift   | 16 ++++++++++----
 UnitTests/Sources/BugReportServiceTests.swift | 16 ++++++++++----
 .../Sources/BugReportViewModelTests.swift     |  2 +-
 UnitTests/Sources/ElementXTests.swift         | 16 ++++++++++----
 .../Sources/HomeScreenViewModelTests.swift    |  2 +-
 UnitTests/Sources/ImageAnonymizerTests.swift  | 16 ++++++++++----
 .../Sources/KeychainControllerTests.swift     |  2 +-
 UnitTests/Sources/LocalizationTests.swift     | 16 ++++++++++----
 UnitTests/Sources/LoggingTests.swift          | 16 ++++++++++----
 UnitTests/Sources/LoginViewModelTests.swift   |  2 +-
 .../Sources/RoomScreenViewModelTests.swift    |  2 +-
 .../Sources/ScreenshotDetectorTests.swift     | 16 ++++++++++----
 .../ServerSelectionViewModelTests.swift       |  2 +-
 ...SessionVerificationStateMachineTests.swift | 16 ++++++++++----
 .../SessionVerificationViewModelTests.swift   |  2 +-
 .../Sources/SettingsViewModelTests.swift      |  2 +-
 .../Sources/SplashScreenViewModelTests.swift  |  2 +-
 .../UserIndicatorPresenterSpy.swift           |  2 +-
 .../UserIndicatorQueueTests.swift             |  2 +-
 .../UserIndicators/UserIndicatorTests.swift   |  2 +-
 changelog.d/150.misc                          |  1 +
 project.yml                                   |  1 +
 227 files changed, 1583 insertions(+), 579 deletions(-)
 create mode 100644 ElementX.xcodeproj/xcshareddata/IDETemplateMacros.plist
 create mode 100644 Tools/XcodeGen/IDETemplateMacros.plist
 create mode 100644 Tools/XcodeGen/postGenCommand.sh
 create mode 100644 changelog.d/150.misc

diff --git a/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift b/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift
index 15a68c9590..bea14a6dc0 100644
--- a/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift
+++ b/DesignKit/Sources/Buttons/ElementActionButtonStyle.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift b/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift
index 0740b54835..a63b7cc877 100644
--- a/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift
+++ b/DesignKit/Sources/Buttons/ElementGhostButtonStyle.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Common/ElementControlSize.swift b/DesignKit/Sources/Common/ElementControlSize.swift
index dd3ff8a90b..5c43a27589 100644
--- a/DesignKit/Sources/Common/ElementControlSize.swift
+++ b/DesignKit/Sources/Common/ElementControlSize.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Fonts/ElementFonts.swift b/DesignKit/Sources/Fonts/ElementFonts.swift
index bdddbf88bc..5bf774a984 100644
--- a/DesignKit/Sources/Fonts/ElementFonts.swift
+++ b/DesignKit/Sources/Fonts/ElementFonts.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Fonts/ElementSharedFonts.swift b/DesignKit/Sources/Fonts/ElementSharedFonts.swift
index 7f3f576669..de7da5c11e 100644
--- a/DesignKit/Sources/Fonts/ElementSharedFonts.swift
+++ b/DesignKit/Sources/Fonts/ElementSharedFonts.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Fonts/ElementUIFonts.swift b/DesignKit/Sources/Fonts/ElementUIFonts.swift
index fb181f50ee..03477ff1fa 100644
--- a/DesignKit/Sources/Fonts/ElementUIFonts.swift
+++ b/DesignKit/Sources/Fonts/ElementUIFonts.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Fonts/Fonts.swift b/DesignKit/Sources/Fonts/Fonts.swift
index d781964b75..be33099465 100644
--- a/DesignKit/Sources/Fonts/Fonts.swift
+++ b/DesignKit/Sources/Fonts/Fonts.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Fonts/UIFont.swift b/DesignKit/Sources/Fonts/UIFont.swift
index 3288edcbbe..f93b28d6bf 100644
--- a/DesignKit/Sources/Fonts/UIFont.swift
+++ b/DesignKit/Sources/Fonts/UIFont.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/Shapes/RoundedCornerShape.swift b/DesignKit/Sources/Shapes/RoundedCornerShape.swift
index 9fea65fe92..6f363fb941 100644
--- a/DesignKit/Sources/Shapes/RoundedCornerShape.swift
+++ b/DesignKit/Sources/Shapes/RoundedCornerShape.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift b/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift
index 0f5630fa8f..e6ecda6347 100644
--- a/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift
+++ b/DesignKit/Sources/TextFields/BorderedInputFieldStyle.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift b/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift
index 73db8dc04f..07aeb1e76d 100644
--- a/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift
+++ b/DesignKit/Sources/TextFields/ElementTextFieldStyle.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX.xcodeproj/xcshareddata/IDETemplateMacros.plist b/ElementX.xcodeproj/xcshareddata/IDETemplateMacros.plist
new file mode 100644
index 0000000000..c143a31ed5
--- /dev/null
+++ b/ElementX.xcodeproj/xcshareddata/IDETemplateMacros.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>FILEHEADER</key>
+    <string>
+// Copyright ___YEAR___ New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/ElementX/Sources/AppCoordinator.swift b/ElementX/Sources/AppCoordinator.swift
index e9bad6e771..713168f622 100644
--- a/ElementX/Sources/AppCoordinator.swift
+++ b/ElementX/Sources/AppCoordinator.swift
@@ -1,9 +1,17 @@
 //
-//  AppCoordinator.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/AppCoordinatorStateMachine.swift b/ElementX/Sources/AppCoordinatorStateMachine.swift
index cb37a70518..5be30d3caf 100644
--- a/ElementX/Sources/AppCoordinatorStateMachine.swift
+++ b/ElementX/Sources/AppCoordinatorStateMachine.swift
@@ -1,9 +1,17 @@
 //
-//  AppCoordinatorStateMachine.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 30/05/2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/AppDelegate.swift b/ElementX/Sources/AppDelegate.swift
index a33c8445ab..3106095fab 100644
--- a/ElementX/Sources/AppDelegate.swift
+++ b/ElementX/Sources/AppDelegate.swift
@@ -1,9 +1,17 @@
 //
-//  AppDelegate.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import UIKit
diff --git a/ElementX/Sources/BuildSettings.swift b/ElementX/Sources/BuildSettings.swift
index 8f4dd56fd9..c6b9f82c2e 100644
--- a/ElementX/Sources/BuildSettings.swift
+++ b/ElementX/Sources/BuildSettings.swift
@@ -1,9 +1,17 @@
 //
-//  BuildSettings.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 2.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/Benchmark.swift b/ElementX/Sources/Other/Benchmark.swift
index 601965011a..0394754f60 100644
--- a/ElementX/Sources/Other/Benchmark.swift
+++ b/ElementX/Sources/Other/Benchmark.swift
@@ -1,9 +1,17 @@
 //
-//  Benchmark.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/ElementNavigationController.swift b/ElementX/Sources/Other/ElementNavigationController.swift
index b0847765da..8a282b382a 100644
--- a/ElementX/Sources/Other/ElementNavigationController.swift
+++ b/ElementX/Sources/Other/ElementNavigationController.swift
@@ -1,9 +1,17 @@
 //
-//  ElementNavigationController.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 20.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import UIKit
diff --git a/ElementX/Sources/Other/ElementSettings.swift b/ElementX/Sources/Other/ElementSettings.swift
index 07b9643ada..405de8a66d 100644
--- a/ElementX/Sources/Other/ElementSettings.swift
+++ b/ElementX/Sources/Other/ElementSettings.swift
@@ -1,9 +1,17 @@
 //
-//  ElementSettings.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 24.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/Extensions/Bundle.swift b/ElementX/Sources/Other/Extensions/Bundle.swift
index 30ffd1e360..281d05eec0 100644
--- a/ElementX/Sources/Other/Extensions/Bundle.swift
+++ b/ElementX/Sources/Other/Extensions/Bundle.swift
@@ -1,9 +1,17 @@
 //
-//  Bundle.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 15.04.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/Extensions/String.swift b/ElementX/Sources/Other/Extensions/String.swift
index 17b6b75fe7..f7a3bf4756 100644
--- a/ElementX/Sources/Other/Extensions/String.swift
+++ b/ElementX/Sources/Other/Extensions/String.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
index f1c1e48014..9cae20a473 100644
--- a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
+++ b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilder.swift
@@ -1,9 +1,17 @@
 //
-//  AttributedStringBuilder.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 22/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import DTCoreText
diff --git a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilderProtocol.swift b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilderProtocol.swift
index d1738d94cf..5b7efe63fa 100644
--- a/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilderProtocol.swift
+++ b/ElementX/Sources/Other/HTMLParsing/AttributedStringBuilderProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  AttributedStringBuilderProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 24/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/HTMLParsing/DTHTMLElement+AttributedStringBuilder.swift b/ElementX/Sources/Other/HTMLParsing/DTHTMLElement+AttributedStringBuilder.swift
index b93a9b54ac..f394a2673d 100644
--- a/ElementX/Sources/Other/HTMLParsing/DTHTMLElement+AttributedStringBuilder.swift
+++ b/ElementX/Sources/Other/HTMLParsing/DTHTMLElement+AttributedStringBuilder.swift
@@ -1,9 +1,17 @@
 //
-//  DTHTMLElement+AttributedStringBuilder.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 24/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import DTCoreText
diff --git a/ElementX/Sources/Other/HTMLParsing/ElementXAttributeScope.swift b/ElementX/Sources/Other/HTMLParsing/ElementXAttributeScope.swift
index 9294ffcb30..777dad0960 100644
--- a/ElementX/Sources/Other/HTMLParsing/ElementXAttributeScope.swift
+++ b/ElementX/Sources/Other/HTMLParsing/ElementXAttributeScope.swift
@@ -1,9 +1,17 @@
 //
-//  ElementXAttributeScope.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 23/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.h b/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.h
index b22ff9dc8a..3c574509c8 100644
--- a/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.h
+++ b/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.h
@@ -1,9 +1,17 @@
 //
-//  UIFont+AttributedStringBuilder.h
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 23/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @import UIKit;
diff --git a/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.m b/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.m
index b257f0e0ca..cdf69570ff 100644
--- a/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.m
+++ b/ElementX/Sources/Other/HTMLParsing/UIFont+AttributedStringBuilder.m
@@ -1,9 +1,17 @@
 //
-//  UIFont+AttributedStringBuilder.h
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 23/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 #import "UIFont+AttributedStringBuilder.h"
diff --git a/ElementX/Sources/Other/ImageAnonymizer.swift b/ElementX/Sources/Other/ImageAnonymizer.swift
index bd7bea9d09..b8afe836a8 100644
--- a/ElementX/Sources/Other/ImageAnonymizer.swift
+++ b/ElementX/Sources/Other/ImageAnonymizer.swift
@@ -1,9 +1,17 @@
 //
-//  UIImage+.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 20.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/MatrixEntityRegex.swift b/ElementX/Sources/Other/MatrixEntityRegex.swift
index e4d72d6006..e9d40dba7d 100644
--- a/ElementX/Sources/Other/MatrixEntityRegex.swift
+++ b/ElementX/Sources/Other/MatrixEntityRegex.swift
@@ -1,9 +1,17 @@
 //
-//  MatrixEntitityRegex.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 26/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Other/Routers/NavigationModule.swift b/ElementX/Sources/Other/Routers/NavigationModule.swift
index ba246cd328..a63cdc0e15 100644
--- a/ElementX/Sources/Other/Routers/NavigationModule.swift
+++ b/ElementX/Sources/Other/Routers/NavigationModule.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/Routers/NavigationRouterStore.swift b/ElementX/Sources/Other/Routers/NavigationRouterStore.swift
index 606877cc63..fcb97a0f99 100644
--- a/ElementX/Sources/Other/Routers/NavigationRouterStore.swift
+++ b/ElementX/Sources/Other/Routers/NavigationRouterStore.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/Routers/NavigationRouterStoreProtocol.swift b/ElementX/Sources/Other/Routers/NavigationRouterStoreProtocol.swift
index ad7a2e7ddd..93509a3a2c 100644
--- a/ElementX/Sources/Other/Routers/NavigationRouterStoreProtocol.swift
+++ b/ElementX/Sources/Other/Routers/NavigationRouterStoreProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/ErrorHandling/AlertInfo.swift b/ElementX/Sources/Other/SwiftUI/ErrorHandling/AlertInfo.swift
index 3c8d224b17..547a2bd2c5 100644
--- a/ElementX/Sources/Other/SwiftUI/ErrorHandling/AlertInfo.swift
+++ b/ElementX/Sources/Other/SwiftUI/ErrorHandling/AlertInfo.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/Layout/FramePreferenceKey.swift b/ElementX/Sources/Other/SwiftUI/Layout/FramePreferenceKey.swift
index 63eb8df9db..9a3e2b481e 100644
--- a/ElementX/Sources/Other/SwiftUI/Layout/FramePreferenceKey.swift
+++ b/ElementX/Sources/Other/SwiftUI/Layout/FramePreferenceKey.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/Layout/ViewFrameReader.swift b/ElementX/Sources/Other/SwiftUI/Layout/ViewFrameReader.swift
index 1bb6c50ded..19c411d7fa 100644
--- a/ElementX/Sources/Other/SwiftUI/Layout/ViewFrameReader.swift
+++ b/ElementX/Sources/Other/SwiftUI/Layout/ViewFrameReader.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/ViewModel/BindableState.swift b/ElementX/Sources/Other/SwiftUI/ViewModel/BindableState.swift
index eaaf48e30c..15d67d2c58 100644
--- a/ElementX/Sources/Other/SwiftUI/ViewModel/BindableState.swift
+++ b/ElementX/Sources/Other/SwiftUI/ViewModel/BindableState.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/ViewModel/StateStoreViewModel.swift b/ElementX/Sources/Other/SwiftUI/ViewModel/StateStoreViewModel.swift
index 81bd305923..6210b75760 100644
--- a/ElementX/Sources/Other/SwiftUI/ViewModel/StateStoreViewModel.swift
+++ b/ElementX/Sources/Other/SwiftUI/ViewModel/StateStoreViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift b/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift
index 584322368a..e511e60536 100644
--- a/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift
+++ b/ElementX/Sources/Other/SwiftUI/Views/ElementToggleStyle.swift
@@ -1,9 +1,17 @@
 //
-//  ElementToggleStyle.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 2.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/ElementX/Sources/Other/UserIndicators/FullscreenLoadingViewPresenter.swift b/ElementX/Sources/Other/UserIndicators/FullscreenLoadingViewPresenter.swift
index a945a73ec1..70c819e38d 100644
--- a/ElementX/Sources/Other/UserIndicators/FullscreenLoadingViewPresenter.swift
+++ b/ElementX/Sources/Other/UserIndicators/FullscreenLoadingViewPresenter.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/LabelledActivityIndicatorView.swift b/ElementX/Sources/Other/UserIndicators/LabelledActivityIndicatorView.swift
index ac3f79cf90..06102f9f13 100644
--- a/ElementX/Sources/Other/UserIndicators/LabelledActivityIndicatorView.swift
+++ b/ElementX/Sources/Other/UserIndicators/LabelledActivityIndicatorView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/RectangleToastView.swift b/ElementX/Sources/Other/UserIndicators/RectangleToastView.swift
index 5bc96b4402..a59d0d78d1 100644
--- a/ElementX/Sources/Other/UserIndicators/RectangleToastView.swift
+++ b/ElementX/Sources/Other/UserIndicators/RectangleToastView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/RoundedToastView.swift b/ElementX/Sources/Other/UserIndicators/RoundedToastView.swift
index 1fd6412459..fe0c042e1f 100644
--- a/ElementX/Sources/Other/UserIndicators/RoundedToastView.swift
+++ b/ElementX/Sources/Other/UserIndicators/RoundedToastView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/ToastViewPresenter.swift b/ElementX/Sources/Other/UserIndicators/ToastViewPresenter.swift
index 191920c6a7..c745f605ec 100644
--- a/ElementX/Sources/Other/UserIndicators/ToastViewPresenter.swift
+++ b/ElementX/Sources/Other/UserIndicators/ToastViewPresenter.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/ToastViewState.swift b/ElementX/Sources/Other/UserIndicators/ToastViewState.swift
index e183e29472..e416dbefc1 100644
--- a/ElementX/Sources/Other/UserIndicators/ToastViewState.swift
+++ b/ElementX/Sources/Other/UserIndicators/ToastViewState.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicator.swift b/ElementX/Sources/Other/UserIndicators/UserIndicator.swift
index 6d2b37df4d..ce9d4786ed 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicator.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicatorDismissal.swift b/ElementX/Sources/Other/UserIndicators/UserIndicatorDismissal.swift
index e7b32fb539..abbb068121 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicatorDismissal.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicatorDismissal.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicatorPresenter.swift b/ElementX/Sources/Other/UserIndicators/UserIndicatorPresenter.swift
index ce5eb821bd..8df335b46a 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicatorPresenter.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicatorPresenter.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicatorQueue.swift b/ElementX/Sources/Other/UserIndicators/UserIndicatorQueue.swift
index 1b798b36d0..d2328b26f8 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicatorQueue.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicatorQueue.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicatorRequest.swift b/ElementX/Sources/Other/UserIndicators/UserIndicatorRequest.swift
index c662a53d0d..9d8cd08f62 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicatorRequest.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicatorRequest.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Other/UserIndicators/UserIndicatorViewPresentable.swift b/ElementX/Sources/Other/UserIndicators/UserIndicatorViewPresentable.swift
index 1d633279bc..0a6c86d958 100644
--- a/ElementX/Sources/Other/UserIndicators/UserIndicatorViewPresentable.swift
+++ b/ElementX/Sources/Other/UserIndicators/UserIndicatorViewPresentable.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift b/ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift
index 18cb591021..aab66779f6 100644
--- a/ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift
+++ b/ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift
@@ -1,9 +1,17 @@
 //
-//  AuthenticationCoordinator.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import MatrixRustSDK
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
index d279f35a3d..3d1df109c0 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginModels.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginModels.swift
index 5a5c6e4df8..7833ee2df1 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginModels.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
index 9c8cf59a68..0faaaf1712 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
index 7934e98fd4..0143c85791 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
index fd1d3a585d..56a0318ed8 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/MockServerSelectionScreenState.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/MockServerSelectionScreenState.swift
index d00971c797..2198da6afb 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/MockServerSelectionScreenState.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/MockServerSelectionScreenState.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
index d502be05b5..c41df49c18 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionModels.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionModels.swift
index cf84e2b7f5..6d3ef52681 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionModels.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
index ac0272079a..3210841fd5 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
index 5a509ab383..999b18dd9e 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/View/ServerSelectionScreen.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/View/ServerSelectionScreen.swift
index 47292f3489..4700b24d9b 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/View/ServerSelectionScreen.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/View/ServerSelectionScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Authentication/UIConstants.swift b/ElementX/Sources/Screens/Authentication/UIConstants.swift
index d00c8ad36c..e4b19d0a8d 100644
--- a/ElementX/Sources/Screens/Authentication/UIConstants.swift
+++ b/ElementX/Sources/Screens/Authentication/UIConstants.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift b/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift
index ff057334c4..3cd60fb820 100644
--- a/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift
+++ b/ElementX/Sources/Screens/BugReport/BugReportCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/BugReport/BugReportModels.swift b/ElementX/Sources/Screens/BugReport/BugReportModels.swift
index 1c8d9bc3f6..b68aaebf42 100644
--- a/ElementX/Sources/Screens/BugReport/BugReportModels.swift
+++ b/ElementX/Sources/Screens/BugReport/BugReportModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/BugReport/BugReportViewModel.swift b/ElementX/Sources/Screens/BugReport/BugReportViewModel.swift
index 35013a1e9e..98ab083df8 100644
--- a/ElementX/Sources/Screens/BugReport/BugReportViewModel.swift
+++ b/ElementX/Sources/Screens/BugReport/BugReportViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/BugReport/BugReportViewModelProtocol.swift b/ElementX/Sources/Screens/BugReport/BugReportViewModelProtocol.swift
index d8a6e10567..ea6d5964b8 100644
--- a/ElementX/Sources/Screens/BugReport/BugReportViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/BugReport/BugReportViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift b/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift
index 779a12ba6c..349a59bc36 100644
--- a/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift
+++ b/ElementX/Sources/Screens/BugReport/View/BugReportScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
index 899ff3cb78..3bafa4e3dc 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
index 3c023c62aa..cdedb32e80 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
index 1d73049e12..e6f532bec3 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModelProtocol.swift b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModelProtocol.swift
index d45a39d9cf..3d8a60af6d 100644
--- a/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/HomeScreen/HomeScreenViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
index c4e82013fd..c8f9fd89c9 100644
--- a/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
+++ b/ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
index 5484baa4c8..397117b10c 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
index 9516e6b921..4d14cb8909 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
index 70935c49c7..37b8a72bd0 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModelProtocol.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModelProtocol.swift
index e9f30dafcd..efd90b1e9b 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift b/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
index 4da965fc0b..f67e188d09 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/ListTableViewAdapter.swift
@@ -1,9 +1,17 @@
 //
-//  ListTableViewAdapter.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 15/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift
index 5832032ff3..fdc0c6542e 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposer.swift
@@ -1,9 +1,17 @@
 //
-//  MessageComposer.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 15/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
index ff1a5b8684..91bf05d388 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/MessageComposerTextField.swift
@@ -1,9 +1,17 @@
 //
-//  MessageComposerTextField.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 15/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
index ec77056fd7..e9b3d64579 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomHeaderView.swift
@@ -1,9 +1,17 @@
 //
-//  RoomHeaderView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 21.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
index 0a4355b19e..f39794bb82 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
index f4021e6e78..085e0a3768 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemBubbledStylerView.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineItemStyleView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 21.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
index 7587ee085e..25ef5457ce 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineItemPlainStylerView.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineItemStyleView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 21.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
index 92439ad9a1..0b1c02f86a 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyle.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineStyle.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 24.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
index ec8d1ac7f8..e2e42c0604 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Style/TimelineStyler.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineStyler.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 24.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
index 0815f34dcd..8bb4e75ac5 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/EmoteRoomTimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  EmoteRoomTimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
index 964d8700de..0226f86b44 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/FormattedBodyText.swift
@@ -1,9 +1,17 @@
 //
-//  FormattedBodyText.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 24/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
index ea821ceb03..cca4d77ebd 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/ImageRoomTimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  ImageRoomTimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
index 1f4ce87b07..5ca22d2a9e 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/NoticeRoomTimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  NoticeRoomTimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift
index 0a268bfc19..fdca08b8e9 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/SeparatorRoomTimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  SeparatorRoomTimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
index 93f7cd7c43..45d4bf8227 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/Timeline/TextRoomTimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  TextRoomTimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemContextMenu.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemContextMenu.swift
index af507b5166..6eb851f2b1 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemContextMenu.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemContextMenu.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineItemContextMenu.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift
index e1ff58ef39..d95bea1102 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineItemList.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineItemList.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 15/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineSenderAvatarView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineSenderAvatarView.swift
index eb4daa4e02..1835223d3f 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineSenderAvatarView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineSenderAvatarView.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineSenderAvatarView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 24.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift b/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
index b567df86e2..aa9b707f72 100644
--- a/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
+++ b/ElementX/Sources/Screens/RoomScreen/View/TimelineView.swift
@@ -1,9 +1,17 @@
 //
-//  TimelineView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 30/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationCoordinator.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationCoordinator.swift
index c2d3a6e28b..bbb4c76473 100644
--- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationCoordinator.swift
+++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationModels.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationModels.swift
index 6b3b5e8384..ce39a9c2fc 100644
--- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationModels.swift
+++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift
index 27ab201405..d0476d7a0d 100644
--- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift
+++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationStateMachine.swift
@@ -1,9 +1,17 @@
 //
-//  SessionVerificationStateMachine.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 15/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModel.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModel.swift
index b264df1ff0..3777ac0919 100644
--- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModel.swift
+++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModelProtocol.swift b/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModelProtocol.swift
index 781e1c2e7c..2aa2e42387 100644
--- a/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/SessionVerification/SessionVerificationViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
index fc21130164..06972b5f8b 100644
--- a/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
+++ b/ElementX/Sources/Screens/SessionVerification/View/SessionVerificationScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift b/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift
index 91ea1fe0dd..8592670741 100644
--- a/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Settings/SettingsModels.swift b/ElementX/Sources/Screens/Settings/SettingsModels.swift
index d0b2d5c35b..ad9d49a0a5 100644
--- a/ElementX/Sources/Screens/Settings/SettingsModels.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Settings/SettingsViewModel.swift b/ElementX/Sources/Screens/Settings/SettingsViewModel.swift
index ccf6ec9b5f..4488ec51b5 100644
--- a/ElementX/Sources/Screens/Settings/SettingsViewModel.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Settings/SettingsViewModelProtocol.swift b/ElementX/Sources/Screens/Settings/SettingsViewModelProtocol.swift
index 05e13c667e..8f47af0cc5 100644
--- a/ElementX/Sources/Screens/Settings/SettingsViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/Settings/SettingsViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift b/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
index 3996aca66e..49ded3b823 100644
--- a/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/View/SettingsScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/Splash/SplashViewController.swift b/ElementX/Sources/Screens/Splash/SplashViewController.swift
index 152dbecc3c..7331c5c3dc 100644
--- a/ElementX/Sources/Screens/Splash/SplashViewController.swift
+++ b/ElementX/Sources/Screens/Splash/SplashViewController.swift
@@ -1,9 +1,17 @@
 //
-//  SplashViewController.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 14.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import UIKit
diff --git a/ElementX/Sources/Screens/SplashScreen/SplashScreenCoordinator.swift b/ElementX/Sources/Screens/SplashScreen/SplashScreenCoordinator.swift
index 9590432b4b..1919579706 100644
--- a/ElementX/Sources/Screens/SplashScreen/SplashScreenCoordinator.swift
+++ b/ElementX/Sources/Screens/SplashScreen/SplashScreenCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/SplashScreenModels.swift b/ElementX/Sources/Screens/SplashScreen/SplashScreenModels.swift
index 30f9db2003..d0c13d58e7 100644
--- a/ElementX/Sources/Screens/SplashScreen/SplashScreenModels.swift
+++ b/ElementX/Sources/Screens/SplashScreen/SplashScreenModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModel.swift b/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModel.swift
index 19f9958f83..f0abe5ab7c 100644
--- a/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModel.swift
+++ b/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModelProtocol.swift b/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModelProtocol.swift
index 2f664352b0..64cc86f0dc 100644
--- a/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/SplashScreen/SplashScreenViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift
index 74d2c1fa88..360070eb5a 100644
--- a/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift
+++ b/ElementX/Sources/Screens/SplashScreen/View/SplashScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageIndicator.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageIndicator.swift
index 5d05a50f13..6f557ad70f 100644
--- a/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageIndicator.swift
+++ b/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageIndicator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageView.swift b/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageView.swift
index bc17677190..f80eedc31d 100644
--- a/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageView.swift
+++ b/ElementX/Sources/Screens/SplashScreen/View/SplashScreenPageView.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift b/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
index a81588dc0a..766e4fb951 100644
--- a/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
+++ b/ElementX/Sources/Services/Authentication/AuthenticationServiceProxy.swift
@@ -1,9 +1,17 @@
 //
-//  AuthenticationService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 29/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import AppAuth
diff --git a/ElementX/Sources/Services/Authentication/AuthenticationServiceProxyProtocol.swift b/ElementX/Sources/Services/Authentication/AuthenticationServiceProxyProtocol.swift
index 3cc8179209..679e95547a 100644
--- a/ElementX/Sources/Services/Authentication/AuthenticationServiceProxyProtocol.swift
+++ b/ElementX/Sources/Services/Authentication/AuthenticationServiceProxyProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  AuthenticationServiceProxyProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 29/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import AppAuth
diff --git a/ElementX/Sources/Services/Authentication/MockAuthenticationServiceProxy.swift b/ElementX/Sources/Services/Authentication/MockAuthenticationServiceProxy.swift
index a9f6e814ea..afb191aacc 100644
--- a/ElementX/Sources/Services/Authentication/MockAuthenticationServiceProxy.swift
+++ b/ElementX/Sources/Services/Authentication/MockAuthenticationServiceProxy.swift
@@ -1,9 +1,17 @@
 //
-//  MockAuthenticationService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 29/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import AppAuth
diff --git a/ElementX/Sources/Services/Authentication/OIDCService.swift b/ElementX/Sources/Services/Authentication/OIDCService.swift
index dc744bd684..af70edcfa9 100644
--- a/ElementX/Sources/Services/Authentication/OIDCService.swift
+++ b/ElementX/Sources/Services/Authentication/OIDCService.swift
@@ -1,9 +1,17 @@
 //
-//  OIDCAuthenticationService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 07/07/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import AppAuth
diff --git a/ElementX/Sources/Services/Background/ApplicationProtocol.swift b/ElementX/Sources/Services/Background/ApplicationProtocol.swift
index a194ed1b65..abf113cdcb 100644
--- a/ElementX/Sources/Services/Background/ApplicationProtocol.swift
+++ b/ElementX/Sources/Services/Background/ApplicationProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  ApplicationProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Background/BackgroundTaskProtocol.swift b/ElementX/Sources/Services/Background/BackgroundTaskProtocol.swift
index 9626673124..7b96b75478 100644
--- a/ElementX/Sources/Services/Background/BackgroundTaskProtocol.swift
+++ b/ElementX/Sources/Services/Background/BackgroundTaskProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  BackgroundTaskProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Background/BackgroundTaskServiceProtocol.swift b/ElementX/Sources/Services/Background/BackgroundTaskServiceProtocol.swift
index f080f14a6b..aa194eddc7 100644
--- a/ElementX/Sources/Services/Background/BackgroundTaskServiceProtocol.swift
+++ b/ElementX/Sources/Services/Background/BackgroundTaskServiceProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  BackgroundTaskServiceProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Background/UIKitBackgroundTask.swift b/ElementX/Sources/Services/Background/UIKitBackgroundTask.swift
index 58da629085..f47e168b8a 100644
--- a/ElementX/Sources/Services/Background/UIKitBackgroundTask.swift
+++ b/ElementX/Sources/Services/Background/UIKitBackgroundTask.swift
@@ -1,9 +1,17 @@
 //
-//  UIKitBackgroundTask.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Background/UIKitBackgroundTaskService.swift b/ElementX/Sources/Services/Background/UIKitBackgroundTaskService.swift
index 291a64b2a6..caa3a3dd50 100644
--- a/ElementX/Sources/Services/Background/UIKitBackgroundTaskService.swift
+++ b/ElementX/Sources/Services/Background/UIKitBackgroundTaskService.swift
@@ -1,9 +1,17 @@
 //
-//  UIKitBackgroundTaskService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/BugReport/BugReportService.swift b/ElementX/Sources/Services/BugReport/BugReportService.swift
index cdd65026e8..12a593555a 100644
--- a/ElementX/Sources/Services/BugReport/BugReportService.swift
+++ b/ElementX/Sources/Services/BugReport/BugReportService.swift
@@ -1,9 +1,17 @@
 //
-//  BugReportService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 16.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift b/ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift
index 9a9c860545..f8f9c5fcf1 100644
--- a/ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift
+++ b/ElementX/Sources/Services/BugReport/BugReportServiceProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  BugReportServiceProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 16.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/BugReport/MockBugReportService.swift b/ElementX/Sources/Services/BugReport/MockBugReportService.swift
index 9c2f01de8f..8288484eeb 100644
--- a/ElementX/Sources/Services/BugReport/MockBugReportService.swift
+++ b/ElementX/Sources/Services/BugReport/MockBugReportService.swift
@@ -1,9 +1,17 @@
 //
-//  MockBugReportService.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 16.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift b/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
index 960e4428b8..17a19c5492 100644
--- a/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
+++ b/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
@@ -1,9 +1,17 @@
 //
-//  ScreenshotObserver.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 31.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Client/ClientError.swift b/ElementX/Sources/Services/Client/ClientError.swift
index 2e102e6911..379b8c4f1b 100644
--- a/ElementX/Sources/Services/Client/ClientError.swift
+++ b/ElementX/Sources/Services/Client/ClientError.swift
@@ -1,9 +1,17 @@
 //
-//  ClientError.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 30/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Client/ClientProxy.swift b/ElementX/Sources/Services/Client/ClientProxy.swift
index 0c5e3f7f56..aeea5a7341 100644
--- a/ElementX/Sources/Services/Client/ClientProxy.swift
+++ b/ElementX/Sources/Services/Client/ClientProxy.swift
@@ -1,9 +1,17 @@
 //
-//  ClientProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 14.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
index 41e86ee948..bc3e0c025b 100644
--- a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
+++ b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  ClientProxyProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 26/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Client/MockClientProxy.swift b/ElementX/Sources/Services/Client/MockClientProxy.swift
index 69812996cf..ad7acc6853 100644
--- a/ElementX/Sources/Services/Client/MockClientProxy.swift
+++ b/ElementX/Sources/Services/Client/MockClientProxy.swift
@@ -1,9 +1,17 @@
 //
-//  MockClientProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 29/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Media/MediaProvider.swift b/ElementX/Sources/Services/Media/MediaProvider.swift
index fc6b54b797..061bc87f1f 100644
--- a/ElementX/Sources/Services/Media/MediaProvider.swift
+++ b/ElementX/Sources/Services/Media/MediaProvider.swift
@@ -1,9 +1,17 @@
 //
-//  MediaProvider.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Kingfisher
diff --git a/ElementX/Sources/Services/Media/MediaProviderProtocol.swift b/ElementX/Sources/Services/Media/MediaProviderProtocol.swift
index 2914d60949..7bc7fb4459 100644
--- a/ElementX/Sources/Services/Media/MediaProviderProtocol.swift
+++ b/ElementX/Sources/Services/Media/MediaProviderProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  MediaProviderProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 17/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Media/MediaSource.swift b/ElementX/Sources/Services/Media/MediaSource.swift
index 4dc753f7a8..d03dd68f55 100644
--- a/ElementX/Sources/Services/Media/MediaSource.swift
+++ b/ElementX/Sources/Services/Media/MediaSource.swift
@@ -1,9 +1,17 @@
 //
-//  MediaSource.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 06/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Media/MockMediaProvider.swift b/ElementX/Sources/Services/Media/MockMediaProvider.swift
index 7b9ba2326e..9e66aceff3 100644
--- a/ElementX/Sources/Services/Media/MockMediaProvider.swift
+++ b/ElementX/Sources/Services/Media/MockMediaProvider.swift
@@ -1,9 +1,17 @@
 //
-//  MockMediaProvider.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 17/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Members/MemberDetailProviderManager.swift b/ElementX/Sources/Services/Room/Members/MemberDetailProviderManager.swift
index 0795906819..a6bd268619 100644
--- a/ElementX/Sources/Services/Room/Members/MemberDetailProviderManager.swift
+++ b/ElementX/Sources/Services/Room/Members/MemberDetailProviderManager.swift
@@ -1,9 +1,17 @@
 //
-//  MemberDetailProviderManager.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Members/MemberDetailsProvider.swift b/ElementX/Sources/Services/Room/Members/MemberDetailsProvider.swift
index 7c0e531aec..34859aa221 100644
--- a/ElementX/Sources/Services/Room/Members/MemberDetailsProvider.swift
+++ b/ElementX/Sources/Services/Room/Members/MemberDetailsProvider.swift
@@ -1,9 +1,17 @@
 //
-//  MemberDetailProvider.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Members/MemberDetailsProviderProtocol.swift b/ElementX/Sources/Services/Room/Members/MemberDetailsProviderProtocol.swift
index ceccd675c8..bd614d0a25 100644
--- a/ElementX/Sources/Services/Room/Members/MemberDetailsProviderProtocol.swift
+++ b/ElementX/Sources/Services/Room/Members/MemberDetailsProviderProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  MemberDetailProviderProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Messages/EmoteRoomMessage.swift b/ElementX/Sources/Services/Room/Messages/EmoteRoomMessage.swift
index 82c28b64c3..545d80afd3 100644
--- a/ElementX/Sources/Services/Room/Messages/EmoteRoomMessage.swift
+++ b/ElementX/Sources/Services/Room/Messages/EmoteRoomMessage.swift
@@ -1,9 +1,17 @@
 //
-//  EmoteRoomMessage.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Messages/ImageRoomMessage.swift b/ElementX/Sources/Services/Room/Messages/ImageRoomMessage.swift
index d29b1b6f7a..cca14d9a82 100644
--- a/ElementX/Sources/Services/Room/Messages/ImageRoomMessage.swift
+++ b/ElementX/Sources/Services/Room/Messages/ImageRoomMessage.swift
@@ -1,9 +1,17 @@
 //
-//  ImageRoomMessage.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import MatrixRustSDK
diff --git a/ElementX/Sources/Services/Room/Messages/NoticeRoomMessage.swift b/ElementX/Sources/Services/Room/Messages/NoticeRoomMessage.swift
index f7e293e53b..10dfadae48 100644
--- a/ElementX/Sources/Services/Room/Messages/NoticeRoomMessage.swift
+++ b/ElementX/Sources/Services/Room/Messages/NoticeRoomMessage.swift
@@ -1,9 +1,17 @@
 //
-//  NoticeRoomMessage.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Messages/RoomMessageProtocol.swift b/ElementX/Sources/Services/Room/Messages/RoomMessageProtocol.swift
index 879e7213c4..7a70fe4732 100644
--- a/ElementX/Sources/Services/Room/Messages/RoomMessageProtocol.swift
+++ b/ElementX/Sources/Services/Room/Messages/RoomMessageProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomMessageProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/Messages/TextRoomMessage.swift b/ElementX/Sources/Services/Room/Messages/TextRoomMessage.swift
index 772f7448d1..050d3b9b26 100644
--- a/ElementX/Sources/Services/Room/Messages/TextRoomMessage.swift
+++ b/ElementX/Sources/Services/Room/Messages/TextRoomMessage.swift
@@ -1,9 +1,17 @@
 //
-//  TextRoomMessage.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/MockRoomProxy.swift b/ElementX/Sources/Services/Room/MockRoomProxy.swift
index baa224b1b7..2afa839776 100644
--- a/ElementX/Sources/Services/Room/MockRoomProxy.swift
+++ b/ElementX/Sources/Services/Room/MockRoomProxy.swift
@@ -1,9 +1,17 @@
 //
-//  MockRoomProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 17.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Room/RoomMessageFactory.swift b/ElementX/Sources/Services/Room/RoomMessageFactory.swift
index bce3dc4436..660c71d570 100644
--- a/ElementX/Sources/Services/Room/RoomMessageFactory.swift
+++ b/ElementX/Sources/Services/Room/RoomMessageFactory.swift
@@ -1,9 +1,17 @@
 //
-//  RoomMessageFactory.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/RoomMessageFactoryProtocol.swift b/ElementX/Sources/Services/Room/RoomMessageFactoryProtocol.swift
index 79a8fcc782..9dea18ea8f 100644
--- a/ElementX/Sources/Services/Room/RoomMessageFactoryProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomMessageFactoryProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomMessageFactoryProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 26/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/RoomProxy.swift b/ElementX/Sources/Services/Room/RoomProxy.swift
index daf7b1a848..e21924cc60 100644
--- a/ElementX/Sources/Services/Room/RoomProxy.swift
+++ b/ElementX/Sources/Services/Room/RoomProxy.swift
@@ -1,9 +1,17 @@
 //
-//  RoomProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 14.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
index cdae297c4b..1e0bf6b588 100644
--- a/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomProxyProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomProxyProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 17.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Room/RoomSummary/EventBrief.swift b/ElementX/Sources/Services/Room/RoomSummary/EventBrief.swift
index f41a7d5df7..2f4e875714 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/EventBrief.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/EventBrief.swift
@@ -1,9 +1,17 @@
 //
-//  EventBrief.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactory.swift b/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactory.swift
index 4efa7350c7..99cbfac640 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactory.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactory.swift
@@ -1,9 +1,17 @@
 //
-//  EventBriefFactory.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactoryProtocol.swift b/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactoryProtocol.swift
index 7743db3db6..e0bf0ab31c 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactoryProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/EventBriefFactoryProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  EventBriefFactoryProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Room/RoomSummary/MockRoomSummary.swift b/ElementX/Sources/Services/Room/RoomSummary/MockRoomSummary.swift
index bda92b4786..be61ef91e4 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/MockRoomSummary.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/MockRoomSummary.swift
@@ -1,9 +1,17 @@
 //
-//  MockRoomSummary.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
index ca2feed975..f016f8ce2d 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummary.swift
@@ -1,9 +1,17 @@
 //
-//  RoomSummary.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProtocol.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProtocol.swift
index 01d31097c0..ba103465a2 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProtocol.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomSummaryProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomSummaryProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 01/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Session/MockUserSession.swift b/ElementX/Sources/Services/Session/MockUserSession.swift
index 23e7543b2e..aaa8cf0134 100644
--- a/ElementX/Sources/Services/Session/MockUserSession.swift
+++ b/ElementX/Sources/Services/Session/MockUserSession.swift
@@ -1,9 +1,17 @@
 //
-//  MockUserSession.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 29/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Session/UserSession.swift b/ElementX/Sources/Services/Session/UserSession.swift
index 168157d17d..3178fcba8c 100644
--- a/ElementX/Sources/Services/Session/UserSession.swift
+++ b/ElementX/Sources/Services/Session/UserSession.swift
@@ -1,9 +1,17 @@
 //
-//  UserSession.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 27/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Session/UserSessionProtocol.swift b/ElementX/Sources/Services/Session/UserSessionProtocol.swift
index 5f05cb1ef4..1cd14639f1 100644
--- a/ElementX/Sources/Services/Session/UserSessionProtocol.swift
+++ b/ElementX/Sources/Services/Session/UserSessionProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  UserSessionProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 27/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift b/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
index 09374fad63..b7b0ada2ab 100644
--- a/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
+++ b/ElementX/Sources/Services/SessionVerification/MockSessionVerificationControllerProxy.swift
@@ -1,9 +1,17 @@
 //
-//  MockSessionVerificationControllerProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 07/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxy.swift b/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxy.swift
index 9a07c88ecc..0b739a8f30 100644
--- a/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxy.swift
+++ b/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxy.swift
@@ -1,9 +1,17 @@
 //
-//  SessionVerificationControllerProxy.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 06/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxyProtocol.swift b/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxyProtocol.swift
index 4f1eacf437..0859b0bf47 100644
--- a/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxyProtocol.swift
+++ b/ElementX/Sources/Services/SessionVerification/SessionVerificationControllerProxyProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  SessionVerificationControllerProxyProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 07/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift b/ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift
index 6c7c0a76dd..e15ee7b502 100644
--- a/ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift
+++ b/ElementX/Sources/Services/Timeline/MockRoomTimelineController.swift
@@ -1,9 +1,17 @@
 //
-//  MockRoomTimelineController.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04.03.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/RoomTimelineController.swift
index 1984d4c2f8..40335bdca9 100644
--- a/ElementX/Sources/Services/Timeline/RoomTimelineController.swift
+++ b/ElementX/Sources/Services/Timeline/RoomTimelineController.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineController.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04.03.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift b/ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift
index f3e93be462..05ace11d12 100644
--- a/ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/RoomTimelineControllerProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineControllerProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04.03.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
index cf379f8e53..78609c46f1 100644
--- a/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
+++ b/ElementX/Sources/Services/Timeline/RoomTimelineProvider.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimeline.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04.03.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift b/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift
index 1911a6dc24..15bbba1c40 100644
--- a/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/RoomTimelineProviderProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineProviderProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Combine
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/DecorationTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/DecorationTimelineItemProtocol.swift
index 71714ea1bf..fc9db1b449 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/DecorationTimelineItemProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/DecorationTimelineItemProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  DecorationTimelineItemProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift
index 4830d92efa..604089bc7c 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/EventBasedTimelineItemProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  EventBasedTimelineItemProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 18/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift
index 60c4742412..8ea6daeb4d 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/EmoteRoomTimelineItem.swift
@@ -1,9 +1,17 @@
 //
-//  EmoteRoomTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift
index fd891fb88d..e0fb461d89 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/ImageRoomTimelineItem.swift
@@ -1,9 +1,17 @@
 //
-//  ImageRoomTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift
index 00419c070f..48b0c1be5c 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/NoticeRoomTimelineItem.swift
@@ -1,9 +1,17 @@
 //
-//  NoticeRoomTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift
index f5b2b39e0e..7d0567a97e 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/SeparatorRoomTimelineItem.swift
@@ -1,9 +1,17 @@
 //
-//  SectionSeparatorTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift
index 41670afaac..02fe654452 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/Items/TextRoomTimelineItem.swift
@@ -1,9 +1,17 @@
 //
-//  TextRoomTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
index db50359e0b..04305bcec4 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineItemFactory.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift
index 55e340499c..b733351855 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactoryProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineItemFactoryProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 26/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemProtocol.swift
index 17e66b5a6c..bfc3c42e66 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineItemProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift
index 5da3086665..f0ae752e3b 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactory.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineViewFactory.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 16/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactoryProtocol.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactoryProtocol.swift
index 32a3fc953c..92ecc28569 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactoryProtocol.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewFactoryProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  RoomTimelineViewFactoryProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 26/05/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift
index dcc2fea462..8720d5050d 100644
--- a/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift
+++ b/ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineViewProvider.swift
@@ -1,9 +1,17 @@
 //
-//  TextRoomTimelineItem.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 04.03.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/UserSessionStore/FileManager.swift b/ElementX/Sources/Services/UserSessionStore/FileManager.swift
index dca39c313f..282b35c0b0 100644
--- a/ElementX/Sources/Services/UserSessionStore/FileManager.swift
+++ b/ElementX/Sources/Services/UserSessionStore/FileManager.swift
@@ -1,9 +1,17 @@
 //
-//  FileManager.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 19/07/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/UserSessionStore/KeychainController.swift b/ElementX/Sources/Services/UserSessionStore/KeychainController.swift
index 1d1bd3da65..5c69877cc7 100644
--- a/ElementX/Sources/Services/UserSessionStore/KeychainController.swift
+++ b/ElementX/Sources/Services/UserSessionStore/KeychainController.swift
@@ -1,9 +1,17 @@
 //
-//  KeychainController.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 14.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/Services/UserSessionStore/KeychainControllerProtocol.swift b/ElementX/Sources/Services/UserSessionStore/KeychainControllerProtocol.swift
index 1778677e05..e367f98d72 100644
--- a/ElementX/Sources/Services/UserSessionStore/KeychainControllerProtocol.swift
+++ b/ElementX/Sources/Services/UserSessionStore/KeychainControllerProtocol.swift
@@ -1,9 +1,17 @@
 //
-//  KeychainControllerProtocol.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 14.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/UITestScreenIdentifier.swift b/ElementX/Sources/UITestScreenIdentifier.swift
index 5a683de3e5..05f5842c4e 100644
--- a/ElementX/Sources/UITestScreenIdentifier.swift
+++ b/ElementX/Sources/UITestScreenIdentifier.swift
@@ -1,9 +1,17 @@
 //
-//  ScreenIdentifier.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 21.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import Foundation
diff --git a/ElementX/Sources/UITestsAppCoordinator.swift b/ElementX/Sources/UITestsAppCoordinator.swift
index 3e97f42e64..cd7363699d 100644
--- a/ElementX/Sources/UITestsAppCoordinator.swift
+++ b/ElementX/Sources/UITestsAppCoordinator.swift
@@ -1,9 +1,17 @@
 //
-//  UITestsAppCoordinator.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 29/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/ElementX/Sources/UITestsRootView.swift b/ElementX/Sources/UITestsRootView.swift
index f80efd800b..8d1920f04d 100644
--- a/ElementX/Sources/UITestsRootView.swift
+++ b/ElementX/Sources/UITestsRootView.swift
@@ -1,9 +1,17 @@
 //
-//  UITestsRootView.swift
-//  ElementX
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 29/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import SwiftUI
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateCoordinator.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateCoordinator.swift
index cb6f158c01..d03f15b089 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateCoordinator.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateCoordinator.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateModels.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateModels.swift
index a07d0888d0..1584826513 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateModels.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateModels.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModel.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModel.swift
index 7da3b439e2..d74c822f6c 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModel.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModel.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModelProtocol.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModelProtocol.swift
index 3cb2493fb2..40fe26120e 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModelProtocol.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/TemplateViewModelProtocol.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift
index f55990ba8c..3d4d6828d0 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/ElementX/View/TemplateScreen.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift b/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift
index c5a1d5e9ee..c0a4befc3e 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/Tests/UI/TemplateScreenUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateViewModelTests.swift b/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateViewModelTests.swift
index 405500ab18..ab6ca0df12 100644
--- a/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateViewModelTests.swift
+++ b/Tools/Scripts/Templates/SimpleScreenExample/Tests/Unit/TemplateViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/Tools/XcodeGen/IDETemplateMacros.plist b/Tools/XcodeGen/IDETemplateMacros.plist
new file mode 100644
index 0000000000..c143a31ed5
--- /dev/null
+++ b/Tools/XcodeGen/IDETemplateMacros.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>FILEHEADER</key>
+    <string>
+// Copyright ___YEAR___ New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//</string>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/Tools/XcodeGen/postGenCommand.sh b/Tools/XcodeGen/postGenCommand.sh
new file mode 100644
index 0000000000..806da8fb2e
--- /dev/null
+++ b/Tools/XcodeGen/postGenCommand.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This script is invoked by xcodegen for running post commands
+
+# Move file header template in project shared data folder
+cp IDETemplateMacros.plist ../../ElementX.xcodeproj/xcshareddata/
diff --git a/UITests/Sources/Application.swift b/UITests/Sources/Application.swift
index 520b9bc489..761164e1a4 100644
--- a/UITests/Sources/Application.swift
+++ b/UITests/Sources/Application.swift
@@ -1,9 +1,17 @@
 //
-//  Application.swift
-//  UITests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 13/04/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import XCTest
diff --git a/UITests/Sources/AuthenticationCoordinatorUITests.swift b/UITests/Sources/AuthenticationCoordinatorUITests.swift
index 93a027cc56..2a033063fc 100644
--- a/UITests/Sources/AuthenticationCoordinatorUITests.swift
+++ b/UITests/Sources/AuthenticationCoordinatorUITests.swift
@@ -1,9 +1,17 @@
 //
-//  AuthenticationCoordinatorUITests.swift
-//  UITests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Doug on 30/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import XCTest
diff --git a/UITests/Sources/BugReportUITests.swift b/UITests/Sources/BugReportUITests.swift
index 8d2ef3c20a..fdc6d1ce21 100644
--- a/UITests/Sources/BugReportUITests.swift
+++ b/UITests/Sources/BugReportUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/HomeScreenUITests.swift b/UITests/Sources/HomeScreenUITests.swift
index e6085fff9f..ab2bedd418 100644
--- a/UITests/Sources/HomeScreenUITests.swift
+++ b/UITests/Sources/HomeScreenUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/LoginScreenUITests.swift b/UITests/Sources/LoginScreenUITests.swift
index 0b15b28ad4..e36299966b 100644
--- a/UITests/Sources/LoginScreenUITests.swift
+++ b/UITests/Sources/LoginScreenUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/RoomScreenUITests.swift b/UITests/Sources/RoomScreenUITests.swift
index a1f059408e..2a4003ee41 100644
--- a/UITests/Sources/RoomScreenUITests.swift
+++ b/UITests/Sources/RoomScreenUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/ServerSelectionUITests.swift b/UITests/Sources/ServerSelectionUITests.swift
index 0f3ade6b8d..86b36f58e0 100644
--- a/UITests/Sources/ServerSelectionUITests.swift
+++ b/UITests/Sources/ServerSelectionUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/SessionVerificationUITests.swift b/UITests/Sources/SessionVerificationUITests.swift
index 4729aef33f..14100615de 100644
--- a/UITests/Sources/SessionVerificationUITests.swift
+++ b/UITests/Sources/SessionVerificationUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/SettingsUITests.swift b/UITests/Sources/SettingsUITests.swift
index fdb9789e4d..aac02af11c 100644
--- a/UITests/Sources/SettingsUITests.swift
+++ b/UITests/Sources/SettingsUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UITests/Sources/SplashScreenUITests.swift b/UITests/Sources/SplashScreenUITests.swift
index 5ed3437311..e56022f91e 100644
--- a/UITests/Sources/SplashScreenUITests.swift
+++ b/UITests/Sources/SplashScreenUITests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/AttributedStringBuilderTests.swift b/UnitTests/Sources/AttributedStringBuilderTests.swift
index 24ebe08bd1..18668b0417 100644
--- a/UnitTests/Sources/AttributedStringBuilderTests.swift
+++ b/UnitTests/Sources/AttributedStringBuilderTests.swift
@@ -1,9 +1,17 @@
 //
-//  AttributedStringBuilderTests.swift
-//  ElementXTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 28/03/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/BackgroundTaskTests.swift b/UnitTests/Sources/BackgroundTaskTests.swift
index 0d91e922a7..403dbb0844 100644
--- a/UnitTests/Sources/BackgroundTaskTests.swift
+++ b/UnitTests/Sources/BackgroundTaskTests.swift
@@ -1,9 +1,17 @@
 //
-//  BackgroundTaskTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 28.06.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import XCTest
diff --git a/UnitTests/Sources/BugReportServiceTests.swift b/UnitTests/Sources/BugReportServiceTests.swift
index 6231e5ab03..a66562e190 100644
--- a/UnitTests/Sources/BugReportServiceTests.swift
+++ b/UnitTests/Sources/BugReportServiceTests.swift
@@ -1,9 +1,17 @@
 //
-//  BugReportServiceTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 31.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/BugReportViewModelTests.swift b/UnitTests/Sources/BugReportViewModelTests.swift
index 494dfae723..ef9430ce1e 100644
--- a/UnitTests/Sources/BugReportViewModelTests.swift
+++ b/UnitTests/Sources/BugReportViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/ElementXTests.swift b/UnitTests/Sources/ElementXTests.swift
index 8523506216..e64a66b9cb 100644
--- a/UnitTests/Sources/ElementXTests.swift
+++ b/UnitTests/Sources/ElementXTests.swift
@@ -1,9 +1,17 @@
 //
-//  ElementXTests.swift
-//  ElementXTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 11.02.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/HomeScreenViewModelTests.swift b/UnitTests/Sources/HomeScreenViewModelTests.swift
index 847463b4d4..7a0146b6f2 100644
--- a/UnitTests/Sources/HomeScreenViewModelTests.swift
+++ b/UnitTests/Sources/HomeScreenViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/ImageAnonymizerTests.swift b/UnitTests/Sources/ImageAnonymizerTests.swift
index 83927b7b70..515eb782dc 100644
--- a/UnitTests/Sources/ImageAnonymizerTests.swift
+++ b/UnitTests/Sources/ImageAnonymizerTests.swift
@@ -1,9 +1,17 @@
 //
-//  ImageExtensionTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 31.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/KeychainControllerTests.swift b/UnitTests/Sources/KeychainControllerTests.swift
index 5e19461930..58901faba1 100644
--- a/UnitTests/Sources/KeychainControllerTests.swift
+++ b/UnitTests/Sources/KeychainControllerTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/LocalizationTests.swift b/UnitTests/Sources/LocalizationTests.swift
index 3af868a45d..e0aed45b32 100644
--- a/UnitTests/Sources/LocalizationTests.swift
+++ b/UnitTests/Sources/LocalizationTests.swift
@@ -1,9 +1,17 @@
 //
-//  LocalizationTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 19.04.2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/LoggingTests.swift b/UnitTests/Sources/LoggingTests.swift
index f6ee4b18f8..046745b050 100644
--- a/UnitTests/Sources/LoggingTests.swift
+++ b/UnitTests/Sources/LoggingTests.swift
@@ -1,9 +1,17 @@
 //
-//  LoggingTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 31.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/LoginViewModelTests.swift b/UnitTests/Sources/LoginViewModelTests.swift
index 501729b6a8..a213d4f845 100644
--- a/UnitTests/Sources/LoginViewModelTests.swift
+++ b/UnitTests/Sources/LoginViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/RoomScreenViewModelTests.swift b/UnitTests/Sources/RoomScreenViewModelTests.swift
index 66a80b649e..dcdb4d90d4 100644
--- a/UnitTests/Sources/RoomScreenViewModelTests.swift
+++ b/UnitTests/Sources/RoomScreenViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/ScreenshotDetectorTests.swift b/UnitTests/Sources/ScreenshotDetectorTests.swift
index d6566da78a..cc71faf25f 100644
--- a/UnitTests/Sources/ScreenshotDetectorTests.swift
+++ b/UnitTests/Sources/ScreenshotDetectorTests.swift
@@ -1,9 +1,17 @@
 //
-//  ScreenshotDetectorTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Ismail on 31.05.2022.
-//  Copyright © 2022 element.io. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 @testable import ElementX
diff --git a/UnitTests/Sources/ServerSelectionViewModelTests.swift b/UnitTests/Sources/ServerSelectionViewModelTests.swift
index 8823bb690a..4cdcf1beb2 100644
--- a/UnitTests/Sources/ServerSelectionViewModelTests.swift
+++ b/UnitTests/Sources/ServerSelectionViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/SessionVerificationStateMachineTests.swift b/UnitTests/Sources/SessionVerificationStateMachineTests.swift
index e1a14450a4..dec258de28 100644
--- a/UnitTests/Sources/SessionVerificationStateMachineTests.swift
+++ b/UnitTests/Sources/SessionVerificationStateMachineTests.swift
@@ -1,9 +1,17 @@
 //
-//  SessionVerificationStateMachineTests.swift
-//  UnitTests
+// Copyright 2022 New Vector Ltd
 //
-//  Created by Stefan Ceriu on 28/06/2022.
-//  Copyright © 2022 Element. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 //
 
 import XCTest
diff --git a/UnitTests/Sources/SessionVerificationViewModelTests.swift b/UnitTests/Sources/SessionVerificationViewModelTests.swift
index f79720d843..379aba1ea0 100644
--- a/UnitTests/Sources/SessionVerificationViewModelTests.swift
+++ b/UnitTests/Sources/SessionVerificationViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/SettingsViewModelTests.swift b/UnitTests/Sources/SettingsViewModelTests.swift
index 1daab66f4d..de48ef1080 100644
--- a/UnitTests/Sources/SettingsViewModelTests.swift
+++ b/UnitTests/Sources/SettingsViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/SplashScreenViewModelTests.swift b/UnitTests/Sources/SplashScreenViewModelTests.swift
index 0e2e1b119e..458e39e711 100644
--- a/UnitTests/Sources/SplashScreenViewModelTests.swift
+++ b/UnitTests/Sources/SplashScreenViewModelTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/UserIndicators/UserIndicatorPresenterSpy.swift b/UnitTests/Sources/UserIndicators/UserIndicatorPresenterSpy.swift
index 95306a7bd6..0aefb88d52 100644
--- a/UnitTests/Sources/UserIndicators/UserIndicatorPresenterSpy.swift
+++ b/UnitTests/Sources/UserIndicators/UserIndicatorPresenterSpy.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/UserIndicators/UserIndicatorQueueTests.swift b/UnitTests/Sources/UserIndicators/UserIndicatorQueueTests.swift
index 067d358df7..39ed0e687e 100644
--- a/UnitTests/Sources/UserIndicators/UserIndicatorQueueTests.swift
+++ b/UnitTests/Sources/UserIndicators/UserIndicatorQueueTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/UnitTests/Sources/UserIndicators/UserIndicatorTests.swift b/UnitTests/Sources/UserIndicators/UserIndicatorTests.swift
index 1717b65dd4..033e417233 100644
--- a/UnitTests/Sources/UserIndicators/UserIndicatorTests.swift
+++ b/UnitTests/Sources/UserIndicators/UserIndicatorTests.swift
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 New Vector Ltd
+// Copyright 2022 New Vector Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/changelog.d/150.misc b/changelog.d/150.misc
new file mode 100644
index 0000000000..021d2ebd6f
--- /dev/null
+++ b/changelog.d/150.misc
@@ -0,0 +1 @@
+Use standard file headers.
diff --git a/project.yml b/project.yml
index 251a34141f..bda8699cd1 100644
--- a/project.yml
+++ b/project.yml
@@ -17,6 +17,7 @@ options:
       order: [Sources, Resources, SupportingFiles]
     - pattern: Sources
       order: [Services, Screens, Other]
+  postGenCommand: cd Tools/XcodeGen && sh postGenCommand.sh
 
 settings:
   CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED: YES