diff --git a/theme.code-workspace b/theme.code-workspace
new file mode 100644
index 0000000..90a4723
--- /dev/null
+++ b/theme.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "themes/awsug"
+		}
+	],
+	"settings": {}
+}
\ No newline at end of file
diff --git a/themes/awsug/LICENSE b/themes/awsug/LICENSE
index 8aa2645..1368cc9 100644
--- a/themes/awsug/LICENSE
+++ b/themes/awsug/LICENSE
@@ -1,8 +1,8 @@
 MIT License
 
-Copyright (c) [year] [fullname]
+Copyright (c) [2024] [Kadir Keles]
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission is hereby granted, free of charge, to any official AWS User Group obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
diff --git a/themes/awsug/assets/css/about-old.css b/themes/awsug/assets/css/about-old.css
deleted file mode 100644
index 1f89fa7..0000000
--- a/themes/awsug/assets/css/about-old.css
+++ /dev/null
@@ -1,102 +0,0 @@
-:root {
-	--image-height: 500px;
-}
-
-.about-section {
-	display: flex;
-	flex-direction: row;
-	padding: 1% 5%;
-}
-
-.about-left {
-	padding-right: 5%;
-	width: 65%;
-	height: auto;
-}
-
-.about-area {
-	min-height: 250px;
-	padding-bottom: 25px;
-}
-
-.about-left > .about-area {
-	display: flex;
-	flex-direction: column;
-	justify-content: center;
-}
-
-#about-intro-text {
-	font-size: var(--font-size-quote);
-	font-family: "Bookerly LCD";
-	font-weight: 300;
-	line-height: 80%;
-	margin: 0;
-	margin-bottom: 10px;
-}
-
-#about-slogan-lineone {
-	font-size: var(--font-size-h1);
-	font-family: "Amazon Ember";
-	font-weight: bold;
-	margin: 0;
-	margin-bottom: 10px;
-}
-
-#about-slogan-linetwo {
-	font-size: var(--font-size-h2);
-	font-family: "Amazon Ember";
-	margin: 0;
-	margin-bottom: 10px;
-}
-
-#about-right-text {
-	line-height: 150%;
-	text-align: justify;
-	font-size: 15px;
-	font-family: "Bookerly LCD";
-	font-weight: 300;
-}
-
-.about-left > .about-image img {
-	width: auto;
-	height: var(--image-height);
-	margin-top: 0px;
-	border: 2px solid var(--color-primary-gray);
-	width: 100%;
-	border-radius: 10px;
-}
-
-.about-right {
-	width: 40%;
-	height: auto;
-	padding-left: 5%;
-}
-
-.about-right > .about-area {
-	display: flex;
-	align-items: end;
-}
-
-.about-right > .about-image {
-	display: flex;
-	align-items: center;
-}
-
-.about-right > .about-image img {
-	width: auto;
-	height: var(--image-height);
-	aspect-ratio: 1;
-	object-fit: cover;
-	object-position: 50% 50%;
-	border: 2px solid var(--color-primary-gray);
-	border-radius: 10px;
-}
-
-@media (max-width: 1919px) {
-	.about-section {
-		padding: 1% 1%;
-	}
-	.about-area {
-		min-height: 300px;
-	}
-}
diff --git a/themes/awsug/assets/css/blog.css b/themes/awsug/assets/css/blog.css
index 5bef1b7..03cc6eb 100644
--- a/themes/awsug/assets/css/blog.css
+++ b/themes/awsug/assets/css/blog.css
@@ -34,7 +34,9 @@
 	border-radius: 10px;
 }
 
-.blogSummary {
+.blogIntro {
+	font-family: 'Amazon Ember';
+	font-weight: 300;
     width: 750px;
     text-align: justify;
 }
diff --git a/themes/awsug/content/_index.md b/themes/awsug/content/_index.md
index dc2cc61..7ec9dea 100644
--- a/themes/awsug/content/_index.md
+++ b/themes/awsug/content/_index.md
@@ -1,7 +1,7 @@
 +++
 title = 'Home'
 date = 2023-01-01T08:00:00-07:00
+type = "1-home" # folder containing the html file
+layout = "home" # name of the html file
 draft = false
-+++
-
-This is index.md file in the content folder
++++
\ No newline at end of file
diff --git a/themes/awsug/content/about.md b/themes/awsug/content/about.md
index 2e5c737..d30ae6d 100644
--- a/themes/awsug/content/about.md
+++ b/themes/awsug/content/about.md
@@ -1,6 +1,6 @@
 +++
 title = 'About'
 date = 2023-11-11T17:25:02+01:00
-layout = "about"
-type = "custom"
+type = "2-about" # folder containing the html file
+layout = "about" # name of the html file
 +++
\ No newline at end of file
diff --git a/themes/awsug/content/blog/_index.md b/themes/awsug/content/blog/_index.md
index 0c31506..6c607ea 100644
--- a/themes/awsug/content/blog/_index.md
+++ b/themes/awsug/content/blog/_index.md
@@ -1,5 +1,7 @@
 +++
 title = 'Blog'
 date = 2023-01-01T08:30:00-07:00
+type = "5-blog" # folder containing the html file
+layout = "blog" # name of the html file
 draft = false
 +++
\ No newline at end of file
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.1.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.1.png
new file mode 100644
index 0000000..4d0e878
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.1.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.2.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.2.png
new file mode 100644
index 0000000..d1e2324
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/1.2.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/2.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/2.png
new file mode 100644
index 0000000..60f6b51
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/2.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2 - Instance Summary second.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2 - Instance Summary second.png
new file mode 100644
index 0000000..a1620be
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2 - Instance Summary second.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2.png
new file mode 100755
index 0000000..3dbf54c
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.2.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.png
new file mode 100644
index 0000000..e921303
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/3.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/EC2 User Data Hero.jpg b/themes/awsug/content/blog/common-user-data-templates-for-ec2/EC2 User Data Hero.jpg
new file mode 100644
index 0000000..26d52c1
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/EC2 User Data Hero.jpg differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/_index.md b/themes/awsug/content/blog/common-user-data-templates-for-ec2/_index.md
new file mode 100644
index 0000000..7100676
--- /dev/null
+++ b/themes/awsug/content/blog/common-user-data-templates-for-ec2/_index.md
@@ -0,0 +1,61 @@
++++
+title = 'Common User Data Templates for EC2'
+date = 2023-01-01T09:00:00-07:00
+thumbnailURL = ''
+blogIntro = 'A powerful detail that will save time in repetitive creation of EC2 instances.'
+draft = false
++++
+
+User data is worth considering while launching an EC2 instance. Any type of instance you decide to build, it will be necessary to install some supplementary software (load balancer, content management system, config tools etc.).
+
+A manual, time-consuming method would be to connect to your instance once it’s launched, type in command line one by one, all the software that needs to be installed. User data is an alternative approach, helps you to automatically install all required software with launch of your instance. Especially in repetitive jobs, user data can save you tons of time that is easy to learn and implement.
+
+In order to gain advantage of the user data, simply follow the steps mentioned in How To Launch an EC2 Instance? Article. The only additional step you have to take is:
+- At the bottom of the page, click “Advanced details” and in the new area visible;then find user data input at the bottom of the page, to enter your user data script. 
+
+![Advanced Details](1.1.png)*Once clicked, User data input field will appear at the bottom of the page*
+
+![User Data Box](1.2.png)
+
+
+It’s important to understand what input is given to the user data, in order to figure out what software is included and enabled with the launch of the instance.
+
+Probably the most common script for user data will be shared below and we will elaborate the actions taken in the script line by line:
+
+```
+#!/bin/bash
+yum update -y
+yum install -y httpd.x86_64
+systemctl start httpd.service
+systemctl enable httpd.service
+echo "The EC2 instance is available at $(hostname -f)" > /var/www/html/index.html
+```
+
+The first line indicates to the instance to use bash language as the command interpreter. As EC2 evolves and alternative languages are commonly used for development (Python, Ruby, C# etc.) it’s possible to define user data also in different languages. However, for the most common part, bash is a good choice and its declared at the first line.
+
+When the new EC2 instance is launched, there are some various pre-installed packages that are included within. The second line updates these packages to their latest version, in order to make the instance compatible with following software to be downloaded.
+
+Third line installs an Apache HTTP server on your instance. This is also known as httpd server. A common alternative to Apache HTTP server is an Nginx server. For simple projects, it’s suggested to carry on with Apache, while Nginx can be a life saver for complex projects that require high performance.
+
+Fourth and fifth lines are a command to the system, as systemctl gives the hint. While the third line is starting the httpd server that is recently installed, fourth line is making sure that the server is constantly running. This helps to keep your instance up and running as a server, while you are making various adjustments, adding new packages and so on.
+
+Finally on line six, we are generating an index.html file in the corresponding folder. When your EC2 instance is public, to present an interface on world-wide-web, the corresponding /html/ folder in this line is the spot to add your files. Just for a fresh and clean start, the text is added on the index.html file but once you have the page visible as below, you are free to add any html content to make your site public and alive for the whole world! 
+
+### Sounds good! But is my EC2 Instance Web-Accessible? 
+Great question! As you launch your EC2 instance, you will define your firewall settings by selecting the right security group. In order to make your EC2 instance accessible on the web, make sure it has a security group that allows an HTTP access.
+
+Simply see the screenshot below and make sure it has a record of HTTP type, at port 80 with Anywhere (0.0.0.0/0).
+
+![Outbound Rules](2.png)*You need HTTP setting at port 80 in order to make your EC2 instance accessible on the web.*
+
+Once you have your EC2 instance launched, it will take a few seconds to have it’s state as running. However this doesn’t indicate that your EC2 instance is launched with all conditions stated in the user data.
+
+The best way to find this out is to check the instance summary, as in the screenshot below. When the status is pending, you still need to wait for a couple of minutes until all the changes take place. 
+
+![EC2 Instance Summary](3.png)*It may take a few minutes for the instance to turn into "Running" state.*
+
+As soon as your instance goes into running state, you can open the Public IPv4 address or the DNS in your browser to visit the page and see it yourself.
+
+With different public IP address provided, you can see the areas marked in green color below.If you have any questions or comment, feel free to share below and enjoy the power of AWS that it brings with! 
+
+![EC2 Instance Ready](3.2.png)
\ No newline at end of file
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/banner.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/banner.png
new file mode 100644
index 0000000..c8b98d5
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/banner.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/instance-summary-after-user-data.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/instance-summary-after-user-data.png
new file mode 100755
index 0000000..c207dbe
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/instance-summary-after-user-data.png differ
diff --git a/themes/awsug/content/blog/common-user-data-templates-for-ec2/security_group_http_type.png b/themes/awsug/content/blog/common-user-data-templates-for-ec2/security_group_http_type.png
new file mode 100755
index 0000000..9783fd0
Binary files /dev/null and b/themes/awsug/content/blog/common-user-data-templates-for-ec2/security_group_http_type.png differ
diff --git a/themes/awsug/content/events/_index.md b/themes/awsug/content/events/_index.md
index 41b1d28..d5f26db 100644
--- a/themes/awsug/content/events/_index.md
+++ b/themes/awsug/content/events/_index.md
@@ -1,5 +1,7 @@
 +++
 title = 'Events'
 date = 2023-01-01
+type = "4-events" # folder containing the html file
+layout = "events" # name of the html file
 draft = false
 +++
\ No newline at end of file
diff --git a/themes/awsug/content/team.md b/themes/awsug/content/team.md
index 53160ef..4e87509 100644
--- a/themes/awsug/content/team.md
+++ b/themes/awsug/content/team.md
@@ -1,6 +1,7 @@
 +++
 title = 'Team'
 date = 2023-11-11T17:25:02+01:00
-layout = "team"
-type = "custom"
+type = "3-team" # folder containing the html file
+layout = "team"  # name of the html file
 +++
+meet team
\ No newline at end of file
diff --git a/themes/awsug/layouts/_default/home.html b/themes/awsug/layouts/1-home/home.html
similarity index 100%
rename from themes/awsug/layouts/_default/home.html
rename to themes/awsug/layouts/1-home/home.html
diff --git a/themes/awsug/layouts/custom/about.html b/themes/awsug/layouts/2-about/about.html
similarity index 100%
rename from themes/awsug/layouts/custom/about.html
rename to themes/awsug/layouts/2-about/about.html
diff --git a/themes/awsug/layouts/custom/team.html b/themes/awsug/layouts/3-team/team.html
similarity index 100%
rename from themes/awsug/layouts/custom/team.html
rename to themes/awsug/layouts/3-team/team.html
diff --git a/themes/awsug/layouts/events/list.html b/themes/awsug/layouts/4-events/list.html
similarity index 99%
rename from themes/awsug/layouts/events/list.html
rename to themes/awsug/layouts/4-events/list.html
index c96f9fb..bd3ed03 100644
--- a/themes/awsug/layouts/events/list.html
+++ b/themes/awsug/layouts/4-events/list.html
@@ -46,7 +46,6 @@ <h2 class="eventTitle">{{ .Title }}</h2>
 			<img class="eventBanner" src="{{ .Params.bannerURL }}" alt="{{ .Title }} Banner" />
 		</a>
 		{{ else }}
-
 		<a href="{{ .Params.eventURL }}">
 			<div class="eventBannerContainer">
 				{{ with .Resources.GetMatch "*.png" }}
@@ -54,7 +53,6 @@ <h2 class="eventTitle">{{ .Title }}</h2>
 				{{ end }}
 			</div>
 		</a>
-
 		{{ end }}
 		<div class="eventInfo">
 			<div class="eventInfoIcon">
diff --git a/themes/awsug/layouts/blog/list.html b/themes/awsug/layouts/5-blog/list.html
similarity index 51%
rename from themes/awsug/layouts/blog/list.html
rename to themes/awsug/layouts/5-blog/list.html
index e013dd5..309c626 100644
--- a/themes/awsug/layouts/blog/list.html
+++ b/themes/awsug/layouts/5-blog/list.html
@@ -3,13 +3,19 @@
 
 {{ .Content }}
 <ul id="blogsGrid">
-	{{ range .Pages.ByPublishDate  }}
+	{{ range .Pages.ByPublishDate }}
 	<li class="blogObject">
 		<a href="{{ .RelPermalink }}"
 			><h2 class="blogTitle">{{ .LinkTitle }}</h2>
+			{{ if and .Params.thumbnailURL (strings.HasPrefix .Params.thumbnailURL "https://") }}
 			<img class="blogBanner" src="{{ .Params.thumbnailURL }}" alt="{{ .Title }} Banner" />
+			{{ else }} {{ with .Resources.GetMatch "banner.png" }}
+			<img class="blogBanner" src="{{ .RelPermalink }}" alt="{{ .Title }} Banner" />
+			<!-- prettier-ignore -->
+			{{ end }} 
+	{{ end }}
 		</a>
-		<p class="blogSummary" >{{ .Summary }}</p>
+		<p class="blogIntro">{{ .Params.blogIntro }}</p>
 	</li>
 	{{end}}
 </ul>
diff --git a/themes/awsug/layouts/_default/baseof.html b/themes/awsug/layouts/_default/baseof.html
index be2660c..84633a1 100644
--- a/themes/awsug/layouts/_default/baseof.html
+++ b/themes/awsug/layouts/_default/baseof.html
@@ -1,17 +1,13 @@
 <!DOCTYPE html>
-<html lang="{{ or site.Language.LanguageCode site.Language.Lang }}" dir="{{ or site.Language.LanguageDirection `ltr` }}">
-<head>
-  {{ partial "head.html" . }}
-</head>
-<body>
-  <header class="header">
-    {{ partial "header.html" . }}
-  </header>
-  <main>
-    {{ block "main" . }}{{ end }}
-  </main>
-  <footer class="footer">
-    {{ partial "footer.html" . }}
-  </footer>
-</body>
+<html
+	lang="{{ or site.Language.LanguageCode site.Language.Lang }}"
+	dir="{{ or site.Language.LanguageDirection `ltr` }}">
+	<head>
+		{{ template "_default/head.html" . }}
+	</head>
+	<body>
+		<header class="header">{{ template "_default/header.html" . }}</header>
+		<main>{{ block "main" . }}{{ end }}</main>
+		<footer class="footer">{{ template "_default/footer.html" . }}</footer>
+	</body>
 </html>
diff --git a/themes/awsug/layouts/_default/footer.html b/themes/awsug/layouts/_default/footer.html
new file mode 100644
index 0000000..acbc357
--- /dev/null
+++ b/themes/awsug/layouts/_default/footer.html
@@ -0,0 +1,64 @@
+<div class="footer-line"></div>
+<div class="footer-column">
+  <h3><a href="/">HOME</a></h3>
+  <a href="/">General</a>
+  <a href="#">Sponsors</a>
+  <a href="#">Contribute</a>
+  <a href="#">Feedback</a>
+  <a href="#">Subscribe</a>
+</div>
+
+<div class="footer-column">
+  <h3><a href="/about/">ABOUT</a></h3>
+  <a href="/about">AWS</a>
+  <a href="#">User Groups</a>
+  <a href="#">Community</a>
+</div>
+
+<div class="footer-column">
+  <h3><a href="/team/">TEAM</a></h3>
+  <a href="#">Leaders</a>
+  <a href="#">Members</a>
+  <a href="#">Volunteer</a>
+</div>
+
+<div class="footer-column">
+  <h3><a href="/events/">EVENTS</a></h3>
+  <a href="#">Upcoming Events</a>
+  <a href="#">Past Events</a>
+  <a href="#">Collaborate</a>
+</div>
+
+<div class="footer-column">
+  <h3><a href="/blog/">BLOG</a></h3>
+  <a href="#">Categories</a>
+  <a href="#">Topics</a>
+  <a href="#">Create</a>
+</div>
+
+<div class="footer-right">
+  <img src="/images/logo.png" />
+  <p>
+    This website is run by an independent AWS User Group and it is not affiliated
+    with Amazon Web Services, Inc.
+  </p>
+  <p>
+    Opinions expressed here are solely those of the authors and do not reflect
+    official AWS positions.
+  </p>
+  <div class="footer-social-items">
+    <div class="footer-social-item round-icon">
+      <img src="/images/icons/meetup.png" alt="" />
+    </div>
+    <div class="footer-social-item round-icon">
+      <img src="/images/icons/linkedin.png" alt="" />
+    </div>
+    <div class="footer-social-item round-icon">
+      <img src="/images/icons/twitter.png" alt="" />
+    </div>
+    <div class="footer-social-item round-icon">
+      <img src="/images/icons/email.png" alt="" />
+    </div>
+  </div>
+</div>
+<img src="/images/citygraph.png" class="footer-bg-image" />
diff --git a/themes/awsug/layouts/_default/head.html b/themes/awsug/layouts/_default/head.html
new file mode 100644
index 0000000..590a355
--- /dev/null
+++ b/themes/awsug/layouts/_default/head.html
@@ -0,0 +1,5 @@
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width">
+<title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title> <!-- Title of the site --> 
+{{ partialCached "head/css.html" . }}
+{{ partialCached "head/js.html" . }}
diff --git a/themes/awsug/layouts/_default/header.html b/themes/awsug/layouts/_default/header.html
new file mode 100644
index 0000000..f4be1ba
--- /dev/null
+++ b/themes/awsug/layouts/_default/header.html
@@ -0,0 +1,18 @@
+<div class="container header-container">
+	<div class="logo">
+		<img src="/images/logo.png" alt="{{ .Title }}" />
+	</div>
+	<!-- Navigation menu -->
+	{{ $page := . }}
+	<nav class="navigation">
+		<ul class="nav-list">
+			{{ range site.Menus.main }} {{ $active := or ($page.IsMenuCurrent "main" .) ($page.HasMenuCurrent "main" .) }} {{
+			$active = or $active (eq .Name $page.Title) }}
+			<li {{ if $active }}class="active nav-item" {{else}}class="nav-item" {{ end }}>
+				<a href="{{ .URL }}">{{ .Name }}</a>
+			</li>
+			{{ end }}
+		</ul>
+	</nav>
+	<div class="spacer"></div>
+</div>
diff --git a/themes/awsug/theme.toml b/themes/awsug/theme.toml
index 3ba3164..46f19d8 100644
--- a/themes/awsug/theme.toml
+++ b/themes/awsug/theme.toml
@@ -1,31 +1,16 @@
-name = 'Theme name'
+name = 'AWS User Group Theme'
 license = 'MIT'
-licenselink = 'https://github.com/owner/repo/LICENSE'
-description = 'Theme description'
+licenselink = 'https://github.com/kkeles/awsug-hugo/LICENSE'
+description = 'Common theme for websites of AWS User Groups'
 
 # The home page of the theme, where the source can be found
-homepage = 'https://github.com/owner/repo'
+homepage = 'https://github.com/kkeles/awsug-hugo'
 
 # If you have a running demo of the theme
-demosite = 'https://owner.github.io/repo'
+demosite = 'https://aws-user-group.berlin'
 
-# Taxonomy terms
-tags = ['blog', 'company']
-features = ['some', 'awesome', 'features']
-
-# If the theme has multiple authors
-authors = [
-  {name = 'Name of author', homepage = 'Website of author'},
-  {name = 'Name of author', homepage = 'Website of author'}
-]
 
 # If the theme has a single author
 [author]
-  name = 'Your name'
-  homepage = 'Your website'
-
-# If porting an existing theme
-[original]
-  author = 'Name of original author'
-  homepage = 'Website of original author'
-  repo = 'https://github.com/owner/repo'
+  name = 'Kadir Keles'
+  homepage = 'https://kadirkeles.com'