diff --git a/autoload/airline/themes/atomic.vim b/autoload/airline/themes/atomic.vim
new file mode 100644
index 0000000..7e2bc6e
--- /dev/null
+++ b/autoload/airline/themes/atomic.vim
@@ -0,0 +1,79 @@
+"----------------------------------------------------------------
+"     ___   __                  _
+"    /   | / /_____  ____ ___  (_)____
+"   / /| |/ __/ __ \/ __ `__ \/ / ___/
+"  / ___ / /_/ /_/ / / / / / / / /__
+" /_/  |_\__/\____/_/ /_/ /_/_/\___/
+"
+"----------------------------------------------------------------
+"  Theme   : Atomic
+"  Version : 2.0.0
+"  License : MIT
+"  Author  : Gerard Bajona
+"  URL     : https://github.com/gerardbm/atomic
+" ----------------------------------------------------------------
+"  Colors will be adapted to the current colorscheme. For better
+"  contrast use the atomic colorscheme: it has ten color palettes
+"  with sixteen colors selected procedurally (algorithms).
+"
+"  Atomic colorscheme: https://github.com/gerardbm/vim-atomic
+" ----------------------------------------------------------------
+
+let g:airline#themes#atomic#palette = {}
+
+function! airline#themes#atomic#refresh()
+
+	let s:N1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['ModeMsg', 'fg'], 'none')
+	let s:N2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:N3 = airline#themes#get_highlight2(['ModeMsg', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+	let s:I1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['Question', 'fg'], 'none')
+	let s:I2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:I3 = airline#themes#get_highlight2(['Question', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+	let s:R1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['ErrorMsg', 'fg'], 'none')
+	let s:R2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:R3 = airline#themes#get_highlight2(['ErrorMsg', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+	let s:V1 = airline#themes#get_highlight2(['LineNr', 'bg'], ['WarningMsg', 'fg'], 'none')
+	let s:V2 = airline#themes#get_highlight2(['LineNr', 'bg'], ['LineNr', 'fg'], 'none')
+	let s:V3 = airline#themes#get_highlight2(['WarningMsg', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+	let s:IA1 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')
+	let s:IA2 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')
+	let s:IA3 = airline#themes#get_highlight2(['LineNr', 'fg'], ['StatusLine', 'bg'], 'none')
+	let g:airline#themes#atomic#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+	" Accent color
+	" It helps to remove the bold typography into modes section
+	let g:airline#themes#atomic#palette.accents = {'black' : airline#themes#get_highlight2(['LineNr', 'bg'], ['ModeMsg', 'fg'], 'none')}
+
+	" Mode map
+	let g:airline_mode_map = {
+		\ '__' : '--',
+		\ 'n'  : 'N',
+		\ 'i'  : 'I',
+		\ 'R'  : 'R',
+		\ 'c'  : 'C',
+		\ 'v'  : 'V',
+		\ 'V'  : 'V-L',
+		\ '' : 'V-B',
+		\ 's'  : 'S',
+		\ 'S'  : 'S-L',
+		\ '' : 'S-B',
+		\ 't'  : 'T',
+		\ }
+
+	" Settings
+	let g:airline_symbols.paste = 'Ξ'
+	let g:airline_symbols.spell = 'S'
+	let g:airline_section_z = airline#section#create(['--%1p%%-- ',
+		\ '%#__accent_bold#%l%#__restore__#', ':%c'])
+
+endfunction
+
+call airline#themes#atomic#refresh()
diff --git a/doc/airline-themes.txt b/doc/airline-themes.txt
index eadfc14..6b4ad35 100644
--- a/doc/airline-themes.txt
+++ b/doc/airline-themes.txt
@@ -27,6 +27,7 @@ Currently this repository contains the following themes:
 
     * alduin
     * angr
+    * atomic
     * aurora
     * badcat
     * badwolf